From d646b4e93abba0b845f932d3dfafac4b5acaad71 Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Wed, 3 Sep 2025 13:46:08 +0100 Subject: [PATCH] Updates --- .../functions/dsql/sql/sql-gen-operator-gen.js | 18 ++++++++++-------- .../functions/dsql/sql/sql-gen-operator-gen.ts | 18 ++++++++++-------- package.json | 2 +- 3 files changed, 21 insertions(+), 17 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 84856ea..89ea730 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 @@ -25,30 +25,32 @@ function sqlGenOperatorGen({ fieldName, value, equality, }) { } else if (equality == "LIKE_LOWER") { return { - str: `LOWER(${fieldName}) LIKE LOWER('%${value}%')`, + str: `LOWER(${fieldName}) LIKE LOWER(?)`, + param: `%${value}%`, }; } else if (equality == "LIKE_LOWER_RAW") { return { - str: `LOWER(${fieldName}) LIKE LOWER('${value}')`, + str: `LOWER(${fieldName}) LIKE LOWER(?)`, param: value, }; } else if (equality == "LIKE") { return { - str: `${fieldName} LIKE '%${value}%'`, - param: value, + str: `${fieldName} LIKE ?`, + param: `%${value}%`, }; } else if (equality == "LIKE_RAW") { return { - str: `${fieldName} LIKE '${value}'`, + str: `${fieldName} LIKE ?`, param: value, }; } else if (equality == "NOT_LIKE_LOWER") { return { - str: `LOWER(${fieldName}) NOT LIKE LOWER('%${value}%')`, + str: `LOWER(${fieldName}) NOT LIKE LOWER(?)`, + param: `%${value}%`, }; } else if (equality == "NOT_LIKE_LOWER_RAW") { @@ -59,13 +61,13 @@ function sqlGenOperatorGen({ fieldName, value, equality, }) { } else if (equality == "NOT LIKE") { return { - str: `${fieldName} NOT LIKE '%${value}%'`, + str: `${fieldName} NOT LIKE ?`, param: value, }; } else if (equality == "NOT LIKE_RAW") { return { - str: `${fieldName} NOT LIKE '${value}'`, + str: `${fieldName} NOT LIKE ?`, param: value, }; } diff --git a/package-shared/functions/dsql/sql/sql-gen-operator-gen.ts b/package-shared/functions/dsql/sql/sql-gen-operator-gen.ts index cffb9d4..88abcff 100644 --- a/package-shared/functions/dsql/sql/sql-gen-operator-gen.ts +++ b/package-shared/functions/dsql/sql/sql-gen-operator-gen.ts @@ -34,26 +34,28 @@ export default function sqlGenOperatorGen({ }; } else if (equality == "LIKE_LOWER") { return { - str: `LOWER(${fieldName}) LIKE LOWER('%${value}%')`, + str: `LOWER(${fieldName}) LIKE LOWER(?)`, + param: `%${value}%`, }; } else if (equality == "LIKE_LOWER_RAW") { return { - str: `LOWER(${fieldName}) LIKE LOWER('${value}')`, + str: `LOWER(${fieldName}) LIKE LOWER(?)`, param: value, }; } else if (equality == "LIKE") { return { - str: `${fieldName} LIKE '%${value}%'`, - param: value, + str: `${fieldName} LIKE ?`, + param: `%${value}%`, }; } else if (equality == "LIKE_RAW") { return { - str: `${fieldName} LIKE '${value}'`, + str: `${fieldName} LIKE ?`, param: value, }; } else if (equality == "NOT_LIKE_LOWER") { return { - str: `LOWER(${fieldName}) NOT LIKE LOWER('%${value}%')`, + str: `LOWER(${fieldName}) NOT LIKE LOWER(?)`, + param: `%${value}%`, }; } else if (equality == "NOT_LIKE_LOWER_RAW") { return { @@ -62,12 +64,12 @@ export default function sqlGenOperatorGen({ }; } else if (equality == "NOT LIKE") { return { - str: `${fieldName} NOT LIKE '%${value}%'`, + str: `${fieldName} NOT LIKE ?`, param: value, }; } else if (equality == "NOT LIKE_RAW") { return { - str: `${fieldName} NOT LIKE '${value}'`, + str: `${fieldName} NOT LIKE ?`, param: value, }; } else if (equality == "REGEXP") { diff --git a/package.json b/package.json index f9a4242..40fba00 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "5.2.8", + "version": "5.2.9", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {