From 5c3324105e30ca1c460c1b6ad0a93c383d730326 Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Wed, 3 Sep 2025 13:38:54 +0100 Subject: [PATCH] Updates --- .../dsql/sql/sql-gen-operator-gen.js | 26 ++++++++++++++++++- dist/package-shared/types/index.d.ts | 2 +- dist/package-shared/types/index.js | 4 +++ .../dsql/sql/sql-gen-operator-gen.ts | 22 +++++++++++++++- package-shared/types/index.ts | 4 +++ package.json | 2 +- 6 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dist/package-shared/functions/dsql/sql/sql-gen-operator-gen.js b/dist/package-shared/functions/dsql/sql/sql-gen-operator-gen.js index 2bd77a7..638d347 100644 --- a/dist/package-shared/functions/dsql/sql/sql-gen-operator-gen.js +++ b/dist/package-shared/functions/dsql/sql/sql-gen-operator-gen.js @@ -30,7 +30,19 @@ function sqlGenOperatorGen({ fieldName, value, equality, }) { } else if (equality == "LIKE_RAW") { return { - str: `LOWER(${fieldName}) LIKE LOWER(?)`, + str: `LOWER(${fieldName}) LIKE LOWER('${value}')`, + param: value, + }; + } + else if (equality == "LIKE_NOCASE") { + return { + str: `${fieldName} LIKE '%${value}%'`, + param: value, + }; + } + else if (equality == "LIKE_NOCASE_RAW") { + return { + str: `${fieldName} LIKE '${value}'`, param: value, }; } @@ -45,6 +57,18 @@ function sqlGenOperatorGen({ fieldName, value, equality, }) { param: value, }; } + else if (equality == "NOT_LIKE_NOCASE") { + return { + str: `${fieldName} NOT LIKE '%${value}%'`, + param: value, + }; + } + else if (equality == "NOT_LIKE_NOCASE_RAW") { + return { + str: `${fieldName} NOT LIKE '${value}'`, + param: value, + }; + } else if (equality == "REGEXP") { return { str: `LOWER(${fieldName}) REGEXP LOWER(?)`, diff --git a/dist/package-shared/types/index.d.ts b/dist/package-shared/types/index.d.ts index f7e1ad6..338ec3a 100644 --- a/dist/package-shared/types/index.d.ts +++ b/dist/package-shared/types/index.d.ts @@ -804,7 +804,7 @@ export type FetchApiReturn = { [key: string]: any; }; export declare const ServerQueryOperators: readonly ["AND", "OR"]; -export declare const ServerQueryEqualities: readonly ["EQUAL", "LIKE", "LIKE_RAW", "NOT LIKE", "NOT LIKE_RAW", "NOT EQUAL", "REGEXP", "FULLTEXT", "IN", "NOT IN", "BETWEEN", "NOT BETWEEN", "IS NULL", "IS NOT NULL", "EXISTS", "NOT EXISTS", "GREATER THAN", "GREATER THAN OR EQUAL", "LESS THAN", "LESS THAN OR EQUAL", "MATCH", "MATCH_BOOLEAN"]; +export declare const ServerQueryEqualities: readonly ["EQUAL", "LIKE", "LIKE_RAW", "LIKE_NOCASE", "LIKE_NOCASE_RAW", "NOT LIKE", "NOT LIKE_RAW", "NOT_LIKE_NOCASE", "NOT_LIKE_NOCASE_RAW", "NOT EQUAL", "REGEXP", "FULLTEXT", "IN", "NOT IN", "BETWEEN", "NOT BETWEEN", "IS NULL", "IS NOT NULL", "EXISTS", "NOT EXISTS", "GREATER THAN", "GREATER THAN OR EQUAL", "LESS THAN", "LESS THAN OR EQUAL", "MATCH", "MATCH_BOOLEAN"]; export type ServerQueryParam