Skip to content

HPC-8599: Text search to ignore accents and diacritics #120

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
krishnareddy-tadi wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

HPC-8599: Text search to ignore accents and diacritics #120

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
30 changes: 16 additions & 14 deletions src/db/util/conditions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ namespace PropertyConditions {

// Simple binary operator conditions

export type LikeCondition<T> = {
[Op.LIKE]: T & string;
export type LikeCondition = {
[Op.LIKE]: string;
};
export type ILikeCondition<T> = {
[Op.ILIKE]: T & string;
export type ILikeCondition = {
[Op.ILIKE]: string;
};
export type LtCondition<T> = {
[Op.LT]: T;
Expand All @@ -104,8 +104,8 @@ namespace PropertyConditions {
| NotInCondition<T>
| IsNullCondition
| BetweenCondition<T>
| LikeCondition<T>
| ILikeCondition<T>
| LikeCondition
| ILikeCondition
| LtCondition<T>
| LteCondition<T>
| GtCondition<T>
Expand Down Expand Up @@ -138,12 +138,12 @@ namespace PropertyConditions {

export const isLikeCondition = <T>(
condition: Condition<T>
): condition is LikeCondition<T> =>
): condition is LikeCondition =>
Object.prototype.hasOwnProperty.call(condition, Op.LIKE);

export const isILikeCondition = <T>(
condition: Condition<T>
): condition is ILikeCondition<T> =>
): condition is ILikeCondition =>
Object.prototype.hasOwnProperty.call(condition, Op.ILIKE);

export const isLtCondition = <T>(
Expand Down Expand Up @@ -282,13 +282,15 @@ export const prepareCondition =
propertyCondition[Op.BETWEEN][1],
]);
} else if (PropertyConditions.isLikeCondition(propertyCondition)) {
builder.where(property as string, 'like', propertyCondition[Op.LIKE]);
builder.whereRaw('unaccent(:column:) like unaccent(:value)', {
column: String(property),
value: propertyCondition[Op.LIKE],
});
} else if (PropertyConditions.isILikeCondition(propertyCondition)) {
builder.where(
property as string,
'ilike',
propertyCondition[Op.ILIKE]
);
builder.whereRaw('unaccent(:column:) ilike unaccent(:value)', {
column: String(property),
value: propertyCondition[Op.ILIKE],
});
} else if (PropertyConditions.isLtCondition(propertyCondition)) {
builder.where(property, '<', propertyCondition[Op.LT] as any);
} else if (PropertyConditions.isLteCondition(propertyCondition)) {
Expand Down