dbgate-tools 5.5.2 → 5.5.4-alpha.1

package/lib/DatabaseAnalyser.js

@@ -74,6 +74,7 @@ class DatabaseAnalyser {
     }
     fullAnalysis() {
         return __awaiter(this, void 0, void 0, function* () {
+            logger.info(`Performing full analysis, DB=${(0, schemaInfoTools_1.dbNameLogCategory)(this.dbhan.database)}, engine=${this.driver.engine}`);
             const res = this.addEngineField(yield this._runAnalysis());
             // console.log('FULL ANALYSIS', res);
             return res;
@@ -96,6 +97,7 @@ class DatabaseAnalyser {
     }
     incrementalAnalysis(structure) {
         return __awaiter(this, void 0, void 0, function* () {
+            logger.info(`Performing incremental analysis, DB=${(0, schemaInfoTools_1.dbNameLogCategory)(this.dbhan.database)}, engine=${this.driver.engine}`);
             this.structure = structure;
             const modifications = yield this.getModifications();
             if (modifications == null) {

package/lib/driverBase.d.ts

@@ -49,4 +49,5 @@ export declare const driverBase: {
     createSaveChangeSetScript(changeSet: any, dbinfo: any, defaultCreator: any): any;
     adaptTableInfo(table: any): any;
     listSchemas(pool: any): Promise<any>;
+    writeQueryFromStream(dbhan: any, sql: any): Promise<any>;
 };

package/lib/driverBase.js

@@ -212,4 +212,9 @@ exports.driverBase = {
             return null;
         });
     },
+    writeQueryFromStream(dbhan, sql) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return null;
+        });
+    },
 };

package/lib/schemaInfoTools.d.ts

@@ -7,3 +7,7 @@ export declare function splitCompositeDbName(name: string): {
 };
 export declare function extractDbNameFromComposite(name: string): string;
 export declare function extractSchemaNameFromComposite(name: string): string;
+export declare function dbNameLogCategory(database: string): string;
+export declare function compositeDbNameIfNeeded(connnection: {
+    useSeparateSchemas: boolean;
+}, database: string, schema: string): string;

package/lib/schemaInfoTools.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractSchemaNameFromComposite = exports.extractDbNameFromComposite = exports.splitCompositeDbName = exports.isCompositeDbName = exports.findDefaultSchema = void 0;
+exports.compositeDbNameIfNeeded = exports.dbNameLogCategory = exports.extractSchemaNameFromComposite = exports.extractDbNameFromComposite = exports.splitCompositeDbName = exports.isCompositeDbName = exports.findDefaultSchema = void 0;
 function findDefaultSchema(schemaList, dialect, schemaInStorage = null) {
     var _a;
     if (!schemaList) {
@@ -39,3 +39,20 @@ function extractSchemaNameFromComposite(name) {
     return (_a = splitCompositeDbName(name)) === null || _a === void 0 ? void 0 : _a.schema;
 }
 exports.extractSchemaNameFromComposite = extractSchemaNameFromComposite;
+function dbNameLogCategory(database) {
+    if (isCompositeDbName(database)) {
+        return '~composite';
+    }
+    if (database) {
+        return '~simple';
+    }
+    return '~nodb';
+}
+exports.dbNameLogCategory = dbNameLogCategory;
+function compositeDbNameIfNeeded(connnection, database, schema) {
+    if (connnection === null || connnection === void 0 ? void 0 : connnection.useSeparateSchemas) {
+        return `${database}::${schema}`;
+    }
+    return database;
+}
+exports.compositeDbNameIfNeeded = compositeDbNameIfNeeded;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.5.2",
+  "version": "5.5.4-alpha.1",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -25,14 +25,14 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^5.5.2",
+    "dbgate-types": "^5.5.4-alpha.1",
     "jest": "^24.9.0",
     "ts-jest": "^25.2.1",
     "typescript": "^4.4.3"
   },
   "dependencies": {
-    "dbgate-query-splitter": "^4.10.3",
-    "dbgate-sqltree": "^5.5.2",
+    "dbgate-query-splitter": "^4.10.5",
+    "dbgate-sqltree": "^5.5.4-alpha.1",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",