Skip to content

fix: use ILIKE only in pg. Solves issue #107 #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: use ILIKE only in pg. Solves issue #107 #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,5 @@ dist
.pnp.*

lib
.vscode
.vscode
.idea
4 changes: 2 additions & 2 deletions src/resource.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class Resource extends BaseResource {

async count(filter: Filter) {
return this.SequelizeModel.count(({
where: convertFilter(filter),
where: convertFilter(filter, this.databaseType()),
}));
}

Expand Down Expand Up @@ -119,7 +119,7 @@ class Resource extends BaseResource {
const { direction, sortBy } = sort;
const sequelizeObjects = await this.SequelizeModel
.findAll({
where: convertFilter(filter),
where: convertFilter(filter, this.databaseType()),
limit,
offset,
order: [[sortBy as string, (direction || 'asc').toUpperCase()]],
Expand Down
4 changes: 2 additions & 2 deletions src/utils/convert-filter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Op } from 'sequelize';

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;

const convertFilter = (filter) => {
const convertFilter = (filter, databaseType: string) => {
if (!filter) {
return {};
}
Expand Down Expand Up @@ -35,7 +35,7 @@ const convertFilter = (filter) => {
...(memo[Op.and] || []),
{
[property.name()]: {
[(Op.like as unknown) as string]: `%${escape(value)}%`,
[(databaseType === 'postgres' ? Op.iLike as unknown : Op.like as unknown) as string]: `%${escape(value)}%`,
},
},
],
Expand Down