Skip to content

Commit fbb8645

Browse files
committed
fix: use ILIKE only in pg. Solves issue SoftwareBrothers#107
1 parent 262c58b commit fbb8645

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,5 @@ dist
116116
.pnp.*
117117

118118
lib
119-
.vscode
119+
.vscode
120+
.idea

src/resource.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class Resource extends BaseResource {
8484

8585
async count(filter: Filter) {
8686
return this.SequelizeModel.count(({
87-
where: convertFilter(filter),
87+
where: convertFilter(filter, this.databaseType()),
8888
}));
8989
}
9090

@@ -119,7 +119,7 @@ class Resource extends BaseResource {
119119
const { direction, sortBy } = sort;
120120
const sequelizeObjects = await this.SequelizeModel
121121
.findAll({
122-
where: convertFilter(filter),
122+
where: convertFilter(filter, this.databaseType()),
123123
limit,
124124
offset,
125125
order: [[sortBy as string, (direction || 'asc').toUpperCase()]],

src/utils/convert-filter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Op } from 'sequelize';
33

44
const uuidRegex = /^[0-9A-F]{8}-[0-9A-F]{4}-[5|4|3|2|1][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i;
55

6-
const convertFilter = (filter) => {
6+
const convertFilter = (filter, databaseType: string) => {
77
if (!filter) {
88
return {};
99
}
@@ -35,7 +35,7 @@ const convertFilter = (filter) => {
3535
...(memo[Op.and] || []),
3636
{
3737
[property.name()]: {
38-
[(Op.like as unknown) as string]: `%${escape(value)}%`,
38+
[(databaseType === 'postgres' ? Op.iLike as unknown : Op.like as unknown) as string]: `%${escape(value)}%`,
3939
},
4040
},
4141
],

0 commit comments

Comments
 (0)