Updates

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!`);