From 66f207416d74be3f2ef28308f34a883db88cf115 Mon Sep 17 00:00:00 2001
From: Benjamin Toby <devops@tben.me>
Date: Thu, 13 Nov 2025 06:27:29 +0100
Subject: [PATCH] Updates

---
 dist/package-shared/utils/grab-db-names.d.ts |  4 ++--
 dist/package-shared/utils/grab-db-names.js   | 12 +++++++++---
 package-shared/utils/grab-db-names.ts        | 12 +++++++++---
 package.json                                 |  2 +-
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/dist/package-shared/utils/grab-db-names.d.ts b/dist/package-shared/utils/grab-db-names.d.ts
index 683623f..5480f10 100644
--- a/dist/package-shared/utils/grab-db-names.d.ts
+++ b/dist/package-shared/utils/grab-db-names.d.ts
@@ -15,9 +15,9 @@ type Param = {
  * @returns
  */
 export default function grabDbNames(params?: Param): {
-    userDbPrefix: string;
+    userDbPrefix: string | undefined;
     dbFullName: string;
-    dbNamePrefix: string | undefined;
+    dbNamePrefix: string;
     dbSlug: string;
 };
 export {};
diff --git a/dist/package-shared/utils/grab-db-names.js b/dist/package-shared/utils/grab-db-names.js
index 86f7857..a7e634b 100644
--- a/dist/package-shared/utils/grab-db-names.js
+++ b/dist/package-shared/utils/grab-db-names.js
@@ -13,11 +13,17 @@ const grab_db_full_name_1 = __importDefault(require("./grab-db-full-name"));
  */
 function grabDbNames(params) {
     var _a;
-    const dbNamePrefix = process.env.DSQL_USER_DB_PREFIX;
+    const dbNamePrefix = process.env.DSQL_USER_DB_PREFIX || "datasquirel_user_";
     const finalUserId = ((_a = params === null || params === void 0 ? void 0 : params.user) === null || _a === void 0 ? void 0 : _a.id) || (params === null || params === void 0 ? void 0 : params.userId);
-    const userDbPrefix = finalUserId ? `${dbNamePrefix}${finalUserId}_` : ``;
+    const userDbPrefix = finalUserId
+        ? `${dbNamePrefix}${finalUserId}_`
+        : undefined;
     const finalDbName = (params === null || params === void 0 ? void 0 : params.dbName) || process.env.DSQL_DB_NAME || process.env.DSQL_DB_SLUG;
-    const dbSlug = finalDbName === null || finalDbName === void 0 ? void 0 : finalDbName.replace(userDbPrefix, "");
+    const dbSlug = finalDbName
+        ? userDbPrefix
+            ? finalDbName.replace(userDbPrefix, "")
+            : finalDbName.replace(new RegExp(`^${dbNamePrefix}\\d+_`), "")
+        : undefined;
     if (!dbSlug)
         throw new Error(`No Db Name Provided!`);
     const dbFullName = (0, grab_db_full_name_1.default)({
diff --git a/package-shared/utils/grab-db-names.ts b/package-shared/utils/grab-db-names.ts
index e9c8c8b..e7b082d 100644
--- a/package-shared/utils/grab-db-names.ts
+++ b/package-shared/utils/grab-db-names.ts
@@ -18,14 +18,20 @@ type Param = {
  * @returns
  */
 export default function grabDbNames(params?: Param) {
-    const dbNamePrefix = process.env.DSQL_USER_DB_PREFIX;
+    const dbNamePrefix = process.env.DSQL_USER_DB_PREFIX || "datasquirel_user_";
     const finalUserId = params?.user?.id || params?.userId;
-    const userDbPrefix = finalUserId ? `${dbNamePrefix}${finalUserId}_` : ``;
+    const userDbPrefix = finalUserId
+        ? `${dbNamePrefix}${finalUserId}_`
+        : undefined;
 
     const finalDbName =
         params?.dbName || process.env.DSQL_DB_NAME || process.env.DSQL_DB_SLUG;
 
-    const dbSlug = finalDbName?.replace(userDbPrefix, "");
+    const dbSlug = finalDbName
+        ? userDbPrefix
+            ? finalDbName.replace(userDbPrefix, "")
+            : finalDbName.replace(new RegExp(`^${dbNamePrefix}\\d+_`), "")
+        : undefined;
 
     if (!dbSlug) throw new Error(`No Db Name Provided!`);
 
diff --git a/package.json b/package.json
index 5dd2abb..b2d3e85 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "5.3.4",
+    "version": "5.3.5",
     "description": "Cloud-based SQL data management tool",
     "main": "dist/index.js",
     "bin": {