From ab13c68c8e472403ba9710af3f8a9553da44f68b Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Mon, 4 Aug 2025 08:20:32 +0100 Subject: [PATCH] Updates --- .../api/users/reset-password/(utils)/encrypt-url.js | 2 +- dist/package-shared/functions/backend/db/addDbEntry.js | 4 ++-- .../functions/dsql/sql/sql-delete-generator.d.ts | 2 +- .../functions/dsql/sql/sql-delete-generator.js | 6 ++++-- dist/package-shared/types/index.d.ts | 2 ++ dist/package-shared/utils/data-fetching/crud.js | 3 ++- .../utils/db/schema/data-type-constructor.js | 3 +++ dist/package-shared/utils/grab-host-names.js | 2 +- dist/package-shared/utils/grab-remote-urls.js | 6 +++--- .../api/users/reset-password/(utils)/encrypt-url.ts | 2 +- package-shared/functions/backend/db/addDbEntry.ts | 4 ++-- package-shared/functions/dsql/sql/sql-delete-generator.ts | 7 ++++++- package-shared/types/index.ts | 2 ++ package-shared/utils/data-fetching/crud.ts | 2 ++ package-shared/utils/db/schema/data-type-constructor.ts | 4 ++++ package-shared/utils/grab-host-names.ts | 2 +- package-shared/utils/grab-remote-urls.ts | 6 +++--- package.json | 2 +- 18 files changed, 41 insertions(+), 20 deletions(-) diff --git a/dist/package-shared/functions/api/users/reset-password/(utils)/encrypt-url.js b/dist/package-shared/functions/api/users/reset-password/(utils)/encrypt-url.js index ba4607d..1e90f02 100644 --- a/dist/package-shared/functions/api/users/reset-password/(utils)/encrypt-url.js +++ b/dist/package-shared/functions/api/users/reset-password/(utils)/encrypt-url.js @@ -16,7 +16,7 @@ function encryptReserPasswordUrl({ email, encryptionKey, encryptionSalt, }) { encryptionKey, encryptionSalt, }); - const defaultUrlOrigin = `https://datasquirel.com`; + const defaultUrlOrigin = `https://www.datasquirel.com`; let urlOrigin = process.env.DSQL_HOST || defaultUrlOrigin; const url = `${defaultUrlOrigin}`; } diff --git a/dist/package-shared/functions/backend/db/addDbEntry.js b/dist/package-shared/functions/backend/db/addDbEntry.js index 9d609e4..da5b011 100644 --- a/dist/package-shared/functions/backend/db/addDbEntry.js +++ b/dist/package-shared/functions/backend/db/addDbEntry.js @@ -122,7 +122,7 @@ function addDbEntry(_a) { function grabQueryValuesString(arr) { return arr .map((v, i) => { - if (v.toString().match(/VEC_FromText/i)) { + if (v === null || v === void 0 ? void 0 : v.toString().match(/VEC_FromText/i)) { return v; } return "?"; @@ -131,7 +131,7 @@ function addDbEntry(_a) { } function grabFinalQueryValuesArr(arr) { return arr - .filter((v) => !v.toString().match(/VEC_FromText/i)) + .filter((v) => !(v === null || v === void 0 ? void 0 : v.toString().match(/VEC_FromText/i))) .map((v) => String(v)); } if (newData) { diff --git a/dist/package-shared/functions/dsql/sql/sql-delete-generator.d.ts b/dist/package-shared/functions/dsql/sql/sql-delete-generator.d.ts index 1eeb462..c785abe 100644 --- a/dist/package-shared/functions/dsql/sql/sql-delete-generator.d.ts +++ b/dist/package-shared/functions/dsql/sql/sql-delete-generator.d.ts @@ -6,5 +6,5 @@ interface SQLDeleteGenReturn { /** * # SQL Delete Generator */ -export default function sqlDeleteGenerator({ tableName, deleteKeyValues, dbFullName, data, }: SQLDeleteGeneratorParams): SQLDeleteGenReturn | undefined; +export default function sqlDeleteGenerator({ tableName, deleteKeyValues, dbFullName, data, deleteKeyValuesOperator, }: SQLDeleteGeneratorParams): SQLDeleteGenReturn | undefined; export {}; diff --git a/dist/package-shared/functions/dsql/sql/sql-delete-generator.js b/dist/package-shared/functions/dsql/sql/sql-delete-generator.js index d0b4e82..8365f05 100644 --- a/dist/package-shared/functions/dsql/sql/sql-delete-generator.js +++ b/dist/package-shared/functions/dsql/sql/sql-delete-generator.js @@ -8,7 +8,7 @@ const sql_equality_parser_1 = __importDefault(require("../../../utils/sql-equali /** * # SQL Delete Generator */ -function sqlDeleteGenerator({ tableName, deleteKeyValues, dbFullName, data, }) { +function sqlDeleteGenerator({ tableName, deleteKeyValues, dbFullName, data, deleteKeyValuesOperator, }) { const finalDbName = dbFullName ? `${dbFullName}.` : ""; try { let queryStr = `DELETE FROM ${finalDbName}${tableName}`; @@ -41,7 +41,9 @@ function sqlDeleteGenerator({ tableName, deleteKeyValues, dbFullName, data, }) { queryArr.push(parsedValue); }); } - queryStr += ` WHERE ${deleteBatch.join(" AND ")}`; + if (deleteBatch.length) { + queryStr += ` WHERE ${deleteBatch.join(` ${deleteKeyValuesOperator || "AND"} `)}`; + } return { query: queryStr, values: queryArr, diff --git a/dist/package-shared/types/index.d.ts b/dist/package-shared/types/index.d.ts index ccc7689..b45f0d0 100644 --- a/dist/package-shared/types/index.d.ts +++ b/dist/package-shared/types/index.d.ts @@ -1228,6 +1228,7 @@ export type SQLDeleteGeneratorParams = { tableName: string; deleteKeyValues?: SQLDeleteData[]; + deleteKeyValuesOperator?: "AND" | "OR"; dbFullName?: string; data?: any; }; @@ -1251,6 +1252,7 @@ export type DsqlCrudParam { - if (v.toString().match(/VEC_FromText/i)) { + if (v?.toString().match(/VEC_FromText/i)) { return v; } return "?"; @@ -189,7 +189,7 @@ export default async function addDbEntry< function grabFinalQueryValuesArr(arr: (string | number)[]) { return arr - .filter((v) => !v.toString().match(/VEC_FromText/i)) + .filter((v) => !v?.toString().match(/VEC_FromText/i)) .map((v) => String(v)); } diff --git a/package-shared/functions/dsql/sql/sql-delete-generator.ts b/package-shared/functions/dsql/sql/sql-delete-generator.ts index cba4575..8ff0cde 100644 --- a/package-shared/functions/dsql/sql/sql-delete-generator.ts +++ b/package-shared/functions/dsql/sql/sql-delete-generator.ts @@ -14,6 +14,7 @@ export default function sqlDeleteGenerator({ deleteKeyValues, dbFullName, data, + deleteKeyValuesOperator, }: SQLDeleteGeneratorParams): SQLDeleteGenReturn | undefined { const finalDbName = dbFullName ? `${dbFullName}.` : ""; @@ -54,7 +55,11 @@ export default function sqlDeleteGenerator({ }); } - queryStr += ` WHERE ${deleteBatch.join(" AND ")}`; + if (deleteBatch.length) { + queryStr += ` WHERE ${deleteBatch.join( + ` ${deleteKeyValuesOperator || "AND"} ` + )}`; + } return { query: queryStr, diff --git a/package-shared/types/index.ts b/package-shared/types/index.ts index 619d451..e28614b 100644 --- a/package-shared/types/index.ts +++ b/package-shared/types/index.ts @@ -1442,6 +1442,7 @@ export type SQLDeleteGeneratorParams< > = { tableName: string; deleteKeyValues?: SQLDeleteData[]; + deleteKeyValuesOperator?: "AND" | "OR"; dbFullName?: string; data?: any; }; @@ -1464,6 +1465,7 @@ export type DsqlCrudParam< batchData?: T[]; deleteData?: T; deleteKeyValues?: SQLDeleteData[]; + deleteKeyValuesOperator?: "AND" | "OR"; targetId?: string | number; targetValue?: string | number; targetField?: keyof T; diff --git a/package-shared/utils/data-fetching/crud.ts b/package-shared/utils/data-fetching/crud.ts index 8589146..3054fc8 100644 --- a/package-shared/utils/data-fetching/crud.ts +++ b/package-shared/utils/data-fetching/crud.ts @@ -27,6 +27,7 @@ export default async function dsqlCrud< deleteKeyValues, debug, tableSchema, + deleteKeyValuesOperator, } = params; const finalData = (sanitize ? sanitize({ data }) : data) as T; @@ -77,6 +78,7 @@ export default async function dsqlCrud< tableName: table, dbFullName, deleteKeyValues, + deleteKeyValuesOperator, }); const res = (await connDbHandler( diff --git a/package-shared/utils/db/schema/data-type-constructor.ts b/package-shared/utils/db/schema/data-type-constructor.ts index 075d0b3..7ea2889 100644 --- a/package-shared/utils/db/schema/data-type-constructor.ts +++ b/package-shared/utils/db/schema/data-type-constructor.ts @@ -15,6 +15,10 @@ export default function dataTypeConstructor( return (finalType += `(${limit || 250})`); } + if (finalType == "VECTOR") { + return (finalType += `(${limit || 120})`); + } + if ( finalType == "DECIMAL" || finalType == "FLOAT" || diff --git a/package-shared/utils/grab-host-names.ts b/package-shared/utils/grab-host-names.ts index 1b3782d..9ae80d1 100644 --- a/package-shared/utils/grab-host-names.ts +++ b/package-shared/utils/grab-host-names.ts @@ -42,7 +42,7 @@ export default function grabHostNames(param?: Param): GrabHostNamesReturn { : undefined; return { - host: remoteHost || localHost || "datasquirel.com", + host: remoteHost || localHost || "www.datasquirel.com", port: remoteHostPort || localHostPort || 443, scheme: scheme?.match(/^http$/i) ? http : https, user_id: param?.userId || String(finalEnv["DSQL_API_USER_ID"] || 0), diff --git a/package-shared/utils/grab-remote-urls.ts b/package-shared/utils/grab-remote-urls.ts index f891d75..c3c415e 100644 --- a/package-shared/utils/grab-remote-urls.ts +++ b/package-shared/utils/grab-remote-urls.ts @@ -2,10 +2,10 @@ export default function grabDSQLRemoteURLs() { const communityTarballURL = "https://static.datasquirel.com/images/user-images/user-2/dsql/distro/dsql-community.tar.xz"; const communityTarballShortURL = - "https://datasquirel.com/api/media/dsql-community"; + "https://www.datasquirel.com/api/media/dsql-community"; - const installScriptURL = "https://datasquirel.com/api/media/install"; - const updateScriptURL = "https://datasquirel.com/api/media/update"; + const installScriptURL = "https://www.datasquirel.com/api/media/install"; + const updateScriptURL = "https://www.datasquirel.com/api/media/update"; return { communityTarballURL, diff --git a/package.json b/package.json index 020e431..2adf7d8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "5.1.4", + "version": "5.1.5", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {