diff --git a/dist/package-shared/utils/grab-db-names.js b/dist/package-shared/utils/grab-db-names.js index 718d5dd..f9ba893 100644 --- a/dist/package-shared/utils/grab-db-names.js +++ b/dist/package-shared/utils/grab-db-names.js @@ -33,8 +33,7 @@ function grabDbNames(params) { throw new Error(`No Db Name Provided!`); const dbFullName = (0, grab_db_full_name_1.default)({ dbName: dbSlug, - user: params === null || params === void 0 ? void 0 : params.user, - userId: params === null || params === void 0 ? void 0 : params.userId, + userId: finalUserId, }); if (!dbFullName) throw new Error(`Couldn't grab DB full name!`); diff --git a/dist/package-shared/utils/grab-dsql-connection-config.js b/dist/package-shared/utils/grab-dsql-connection-config.js index 5656107..0dc4b3e 100644 --- a/dist/package-shared/utils/grab-dsql-connection-config.js +++ b/dist/package-shared/utils/grab-dsql-connection-config.js @@ -14,6 +14,7 @@ function grabDSQLConnectionConfig(param) { const dbNames = (param === null || param === void 0 ? void 0 : param.noDb) ? undefined : (0, grab_db_names_1.default)({ dbName: param === null || param === void 0 ? void 0 : param.database }); + console.log("dbNames", dbNames); const config = Object.assign({ host: process.env.DSQL_DB_HOST, user: process.env.DSQL_DB_USERNAME, password: process.env.DSQL_DB_PASSWORD, database: dbNames === null || dbNames === void 0 ? void 0 : dbNames.dbFullName, port: process.env.DSQL_DB_PORT ? Number(process.env.DSQL_DB_PORT) : undefined, charset: "utf8mb4", ssl: (0, grabDbSSL_1.default)(), bigIntAsNumber: true, supportBigNumbers: true, bigNumberStrings: false, dateStrings: true, metaAsArray: true, socketTimeout: CONN_TIMEOUT, connectTimeout: CONN_TIMEOUT, compress: true }, param === null || param === void 0 ? void 0 : param.config); diff --git a/dist/package-shared/utils/grab-dsql-connection.js b/dist/package-shared/utils/grab-dsql-connection.js index 4a2c9fc..42779ba 100644 --- a/dist/package-shared/utils/grab-dsql-connection.js +++ b/dist/package-shared/utils/grab-dsql-connection.js @@ -21,6 +21,7 @@ const grab_dsql_connection_config_1 = __importDefault(require("./grab-dsql-conne function grabDSQLConnection(param) { return __awaiter(this, void 0, void 0, function* () { const config = (0, grab_dsql_connection_config_1.default)(param); + console.log("config", config); try { return yield mariadb_1.default.createConnection(config); } diff --git a/package-shared/utils/grab-db-names.ts b/package-shared/utils/grab-db-names.ts index 8ec27af..446495f 100644 --- a/package-shared/utils/grab-db-names.ts +++ b/package-shared/utils/grab-db-names.ts @@ -43,8 +43,7 @@ export default function grabDbNames(params?: Param) { const dbFullName = grabDbFullName({ dbName: dbSlug, - user: params?.user, - userId: params?.userId, + userId: finalUserId, }); if (!dbFullName) throw new Error(`Couldn't grab DB full name!`); diff --git a/package-shared/utils/grab-dsql-connection-config.ts b/package-shared/utils/grab-dsql-connection-config.ts index 0f2a334..dc7af22 100644 --- a/package-shared/utils/grab-dsql-connection-config.ts +++ b/package-shared/utils/grab-dsql-connection-config.ts @@ -15,6 +15,8 @@ export default function grabDSQLConnectionConfig( ? undefined : grabDbNames({ dbName: param?.database }); + console.log("dbNames", dbNames); + const config: ConnectionConfig = { host: process.env.DSQL_DB_HOST, user: process.env.DSQL_DB_USERNAME, diff --git a/package-shared/utils/grab-dsql-connection.ts b/package-shared/utils/grab-dsql-connection.ts index 7860998..d61f72f 100644 --- a/package-shared/utils/grab-dsql-connection.ts +++ b/package-shared/utils/grab-dsql-connection.ts @@ -11,6 +11,8 @@ export default async function grabDSQLConnection( ): Promise { const config = grabDSQLConnectionConfig(param); + console.log("config", config); + try { return await mariadb.createConnection(config); } catch (error) { diff --git a/package.json b/package.json index 8f217fa..a78080a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "5.3.8", + "version": "5.3.9", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": { @@ -9,7 +9,8 @@ "dsql-schema-to-typedef": "dist/engine/schema-to-typedef.js" }, "scripts": { - "dev": "tsc --watch" + "dev": "tsc --watch", + "compile": "rm -rf dist && tsc && cp -r package-shared/data dist/package-shared/" }, "repository": { "type": "git",