Moduletrace/datasquirel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Benjamin Toby 2025-11-13 06:27:29 +01:00
parent 90c36f2345
commit 66f207416d
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/package-shared/utils/grab-db-names.d.ts vendored
View File

@ -15,9 +15,9 @@ type Param = {
* @returns * @returns
*/ */
export default function grabDbNames(params?: Param): { export default function grabDbNames(params?: Param): {
userDbPrefix: string; userDbPrefix: string | undefined;
dbFullName: string; dbFullName: string;
dbNamePrefix: string | undefined; dbNamePrefix: string;
dbSlug: string; dbSlug: string;
}; };
export {}; export {};

12
dist/package-shared/utils/grab-db-names.js vendored
View File

@ -13,11 +13,17 @@ const grab_db_full_name_1 = __importDefault(require("./grab-db-full-name"));
*/ */
function grabDbNames(params) { function grabDbNames(params) {
var _a; 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 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 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) if (!dbSlug)
throw new Error(`No Db Name Provided!`); throw new Error(`No Db Name Provided!`);
const dbFullName = (0, grab_db_full_name_1.default)({ const dbFullName = (0, grab_db_full_name_1.default)({

12
package-shared/utils/grab-db-names.ts
View File

@ -18,14 +18,20 @@ type Param = {
* @returns * @returns
*/ */
export default function grabDbNames(params?: Param) { 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 finalUserId = params?.user?.id || params?.userId;
const userDbPrefix = finalUserId ? `${dbNamePrefix}${finalUserId}_` : ``; const userDbPrefix = finalUserId
? `${dbNamePrefix}${finalUserId}_`
: undefined;
const finalDbName = const finalDbName =
params?.dbName || process.env.DSQL_DB_NAME || process.env.DSQL_DB_SLUG; 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!`); if (!dbSlug) throw new Error(`No Db Name Provided!`);

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@moduletrace/datasquirel", "name": "@moduletrace/datasquirel",
"version": "5.3.4", "version": "5.3.5",
"description": "Cloud-based SQL data management tool", "description": "Cloud-based SQL data management tool",
"main": "dist/index.js", "main": "dist/index.js",
"bin": { "bin": {