ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: escape underscore char in include query (#3681)

Browse Source
This commit is contained in:
ChengLei Shao 2024-03-12 14:53:12 +08:00 committed by GitHub
parent 94cbbf93b8
commit 37b97c6e52
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/core/database/src/__tests__/operator/string-operator.test.ts
View File

@ -24,6 +24,22 @@ describe('string operator', () => {
});
});
it('should escape underscore in inlcude operator', async () => {
const u1 = await db.getRepository('users').create({
values: {
name: 'names of u1',
},
});
const u1Res = await db.getRepository('users').findOne({
filter: {
'name.$includes': '_',
},
});
expect(u1Res).toBeNull();
});
it('should query with include operator', async () => {
const u1 = await db.getRepository('users').create({
values: {

28
packages/core/database/src/operators/string.ts
View File

@ -1,11 +1,15 @@
import { Op } from 'sequelize';
import { isPg } from './utils';
function escapeLike(value: string) {
return value.replace(/[_%]/g, '\\$&');
}
export default {
$includes(value, ctx) {
if (Array.isArray(value)) {
const conditions = value.map((item) => ({
[isPg(ctx) ? Op.iLike : Op.like]: `%${item}%`,
[isPg(ctx) ? Op.iLike : Op.like]: `%${escapeLike(item)}%`,
}));
return {
@ -14,14 +18,14 @@ export default {
}
return {
[isPg(ctx) ? Op.iLike : Op.like]: `%${value}%`,
[isPg(ctx) ? Op.iLike : Op.like]: `%${escapeLike(value)}%`,
};
},
$notIncludes(value, ctx) {
if (Array.isArray(value)) {
const conditions = value.map((item) => ({
[isPg(ctx) ? Op.notILike : Op.notLike]: `%${item}%`,
[isPg(ctx) ? Op.notILike : Op.notLike]: `%${escapeLike(item)}%`,
}));
return {
@ -30,14 +34,14 @@ export default {
}
return {
[isPg(ctx) ? Op.notILike : Op.notLike]: `%${value}%`,
[isPg(ctx) ? Op.notILike : Op.notLike]: `%${escapeLike(value)}%`,
};
},
$startsWith(value, ctx) {
if (Array.isArray(value)) {
const conditions = value.map((item) => ({
[isPg(ctx) ? Op.iLike : Op.like]: `${item}%`,
[isPg(ctx) ? Op.iLike : Op.like]: `${escapeLike(item)}%`,
}));
return {
@ -46,14 +50,14 @@ export default {
}
return {
[isPg(ctx) ? Op.iLike : Op.like]: `${value}%`,
[isPg(ctx) ? Op.iLike : Op.like]: `${escapeLike(value)}%`,
};
},
$notStartsWith(value, ctx) {
if (Array.isArray(value)) {
const conditions = value.map((item) => ({
[isPg(ctx) ? Op.notILike : Op.notLike]: `${item}%`,
[isPg(ctx) ? Op.notILike : Op.notLike]: `${escapeLike(item)}%`,
}));
return {
@ -62,14 +66,14 @@ export default {
}
return {
[isPg(ctx) ? Op.notILike : Op.notLike]: `${value}%`,
[isPg(ctx) ? Op.notILike : Op.notLike]: `${escapeLike(value)}%`,
};
},
$endWith(value, ctx) {
if (Array.isArray(value)) {
const conditions = value.map((item) => ({
[isPg(ctx) ? Op.iLike : Op.like]: `%${item}`,
[isPg(ctx) ? Op.iLike : Op.like]: `%${escapeLike(item)}`,
}));
return {
@ -78,14 +82,14 @@ export default {
}
return {
[isPg(ctx) ? Op.iLike : Op.like]: `%${value}`,
[isPg(ctx) ? Op.iLike : Op.like]: `%${escapeLike(value)}`,
};
},
$notEndWith(value, ctx) {
if (Array.isArray(value)) {
const conditions = value.map((item) => ({
[isPg(ctx) ? Op.notILike : Op.notLike]: `%${item}`,
[isPg(ctx) ? Op.notILike : Op.notLike]: `%${escapeLike(item)}`,
}));
return {
@ -94,7 +98,7 @@ export default {
}
return {
[isPg(ctx) ? Op.notILike : Op.notLike]: `%${value}`,
[isPg(ctx) ? Op.notILike : Op.notLike]: `%${escapeLike(value)}`,
};
},
} as Record<string, any>;