diff --git a/dist/package-shared/functions/dsql/generate-type-definitions.js b/dist/package-shared/functions/dsql/generate-type-definitions.js index 160392d..d528825 100644 --- a/dist/package-shared/functions/dsql/generate-type-definitions.js +++ b/dist/package-shared/functions/dsql/generate-type-definitions.js @@ -15,7 +15,7 @@ function generateTypeDefinition({ paradigm, table, query, typeDefName, allValues : `DSQL_${query.single}_${query.single_table}`.toUpperCase(); const fields = table.fields; function typeMap(schemaType) { - var _a, _b; + var _a, _b, _c; if (schemaType.options && schemaType.options.length > 0) { return schemaType.options .map((opt) => { @@ -33,6 +33,9 @@ function generateTypeDefinition({ paradigm, table, query, typeDefName, allValues if ((_b = schemaType.dataType) === null || _b === void 0 ? void 0 : _b.match(/text|varchar|timestamp/i)) { return "string"; } + if ((_c = schemaType.dataType) === null || _c === void 0 ? void 0 : _c.match(/boolean/i)) { + return "boolean"; + } return "string"; } const typesArrayTypeScript = []; 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 de4c3fa..ca8163b 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 @@ -35,7 +35,7 @@ function sqlGenOperatorGen({ fieldName, value, equality, }) { } else if (equality == "REGEXP") { return { - str: `LOWER(${fieldName}) REGEXP LOWER(?')`, + str: `LOWER(${fieldName}) REGEXP LOWER(?)`, param: value, }; } diff --git a/package-shared/functions/dsql/generate-type-definitions.ts b/package-shared/functions/dsql/generate-type-definitions.ts index 29dbff3..6f3fa83 100644 --- a/package-shared/functions/dsql/generate-type-definitions.ts +++ b/package-shared/functions/dsql/generate-type-definitions.ts @@ -45,10 +45,15 @@ export default function generateTypeDefinition({ if (schemaType.dataType?.match(/int/i)) { return "number"; } + if (schemaType.dataType?.match(/text|varchar|timestamp/i)) { return "string"; } + if (schemaType.dataType?.match(/boolean/i)) { + return "boolean"; + } + return "string"; } 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 89d0d9f..e219252 100644 --- a/package-shared/functions/dsql/sql/sql-gen-operator-gen.ts +++ b/package-shared/functions/dsql/sql/sql-gen-operator-gen.ts @@ -42,7 +42,7 @@ export default function sqlGenOperatorGen({ }; } else if (equality == "REGEXP") { return { - str: `LOWER(${fieldName}) REGEXP LOWER(?')`, + str: `LOWER(${fieldName}) REGEXP LOWER(?)`, param: value, }; } else if (equality == "FULLTEXT") { diff --git a/package.json b/package.json index 4f66374..0421373 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "5.2.2", + "version": "5.2.3", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {