dbgate-tools 5.2.1 → 5.2.2-alpha.11

package/lib/DatabaseAnalyser.d.ts

@@ -17,14 +17,13 @@ export declare class DatabaseAnalyser {
     incrementalAnalysis(structure: any): Promise<DatabaseInfo>;
     mergeAnalyseResult(newlyAnalysed: any): any;
     getRequestedObjectPureNames(objectTypeField: any, allPureNames: any): any;
-    containsObjectIdCondition(typeFields: any): boolean;
     createQuery(template: any, typeFields: any): any;
     createQueryCore(template: any, typeFields: any): any;
     getDeletedObjectsForField(snapshot: any, objectTypeField: any): any;
     getDeletedObjects(snapshot: any): any[];
     feedback(obj: any): void;
     getModifications(): Promise<any[]>;
-    safeQuery(sql: any): Promise<import("dbgate-types").QueryResult>;
+    analyserQuery(template: any, typeFields: any): Promise<import("dbgate-types").QueryResult>;
     static createEmptyStructure(): DatabaseInfo;
     static byTableFilter(table: any): (x: any) => boolean;
     static extractPrimaryKeys(table: any, pkColumns: any): {

package/lib/DatabaseAnalyser.js

@@ -17,6 +17,8 @@ const sortBy_1 = __importDefault(require("lodash/sortBy"));
 const groupBy_1 = __importDefault(require("lodash/groupBy"));
 const pick_1 = __importDefault(require("lodash/pick"));
 const compact_1 = __importDefault(require("lodash/compact"));
+const getLogger_1 = require("./getLogger");
+const logger = (0, getLogger_1.getLogger)('dbAnalyser');
 const STRUCTURE_FIELDS = ['tables', 'collections', 'views', 'matviews', 'functions', 'procedures', 'triggers'];
 const fp_pick = arg => array => (0, pick_1.default)(array, arg);
 function mergeTableRowCounts(info, rowCounts) {
@@ -114,7 +116,7 @@ class DatabaseAnalyser {
             this.modifications = structureModifications;
             if (structureWithRowCounts)
                 this.structure = structureWithRowCounts;
-            console.log('DB modifications detected:', this.modifications);
+            logger.info({ modifications: this.modifications }, 'DB modifications detected:');
             return this.addEngineField(this.mergeAnalyseResult(yield this._runAnalysis()));
         });
     }
@@ -165,9 +167,9 @@ class DatabaseAnalyser {
     // findObjectById(id) {
     //   return this.structure.tables.find((x) => x.objectId == id);
     // }
-    containsObjectIdCondition(typeFields) {
-        return this.createQueryCore('=OBJECT_ID_CONDITION', typeFields) != ' is not null';
-    }
+    // containsObjectIdCondition(typeFields) {
+    //   return this.createQueryCore('=OBJECT_ID_CONDITION', typeFields) != ' is not null';
+    // }
     createQuery(template, typeFields) {
         return this.createQueryCore(template, typeFields);
     }
@@ -192,7 +194,7 @@ class DatabaseAnalyser {
             .filter(x => typeFields.includes(x.objectTypeField) && (x.action == 'add' || x.action == 'change'))
             .map(x => x.objectId);
         if (filterIds.length == 0) {
-            return template.replace(/=OBJECT_ID_CONDITION/g, " = '0'");
+            return null;
         }
         return template.replace(/=OBJECT_ID_CONDITION/g, ` in (${filterIds.map(x => `'${x}'`).join(',')})`);
     }
@@ -282,13 +284,19 @@ class DatabaseAnalyser {
             return [...(0, compact_1.default)(res), ...this.getDeletedObjects(snapshot)];
         });
     }
-    safeQuery(sql) {
+    analyserQuery(template, typeFields) {
         return __awaiter(this, void 0, void 0, function* () {
+            const sql = this.createQuery(template, typeFields);
+            if (!sql) {
+                return {
+                    rows: [],
+                };
+            }
             try {
                 return yield this.driver.query(this.pool, sql);
             }
             catch (err) {
-                console.log('Error running analyser query', err.message);
+                logger.error({ err }, 'Error running analyser query');
                 return {
                     rows: [],
                 };

package/lib/SqlGenerator.js

@@ -15,7 +15,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqlGenerator = void 0;
 const flatten_1 = __importDefault(require("lodash/flatten"));
 const uniqBy_1 = __importDefault(require("lodash/uniqBy"));
+const getLogger_1 = require("./getLogger");
 const structureTools_1 = require("./structureTools");
+const logger = (0, getLogger_1.getLogger)('sqlGenerator');
 class SqlGenerator {
     constructor(dbinfo, options, objects, dmp, driver, pool) {
         this.options = options;
@@ -26,7 +28,7 @@ class SqlGenerator {
         this.isTruncated = false;
         this.isUnhandledException = false;
         this.handleException = error => {
-            console.log('Unhandled error', error);
+            logger.error({ error }, 'Unhandled error');
             this.isUnhandledException = true;
         };
         this.dbinfo = (0, structureTools_1.extendDatabaseInfo)(dbinfo);

package/lib/createBulkInsertStreamBase.js

@@ -14,7 +14,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBulkInsertStreamBase = void 0;
 const intersection_1 = __importDefault(require("lodash/intersection"));
+const getLogger_1 = require("./getLogger");
 const tableTransforms_1 = require("./tableTransforms");
+const logger = (0, getLogger_1.getLogger)('bulkStreamBase');
 function createBulkInsertStreamBase(driver, stream, pool, name, options) {
     const fullNameQuoted = name.schemaName
         ? `${driver.dialect.quoteIdentifier(name.schemaName)}.${driver.dialect.quoteIdentifier(name.pureName)}`
@@ -39,14 +41,13 @@ function createBulkInsertStreamBase(driver, stream, pool, name, options) {
         let structure = yield driver.analyseSingleTable(pool, name);
         // console.log('ANALYSING', name, structure);
         if (structure && options.dropIfExists) {
-            console.log(`Dropping table ${fullNameQuoted}`);
+            logger.info(`Dropping table ${fullNameQuoted}`);
             yield driver.script(pool, `DROP TABLE ${fullNameQuoted}`);
         }
         if (options.createIfNotExists && (!structure || options.dropIfExists)) {
-            console.log(`Creating table ${fullNameQuoted}`);
             const dmp = driver.createDumper();
             dmp.createTable((0, tableTransforms_1.prepareTableForImport)(Object.assign(Object.assign({}, writable.structure), name)));
-            console.log(dmp.s);
+            logger.info({ sql: dmp.s }, `Creating table ${fullNameQuoted}`);
             yield driver.script(pool, dmp.s);
             structure = yield driver.analyseSingleTable(pool, name);
         }

package/lib/getLogger.d.ts

@@ -0,0 +1,4 @@
+import { Logger } from 'pinomin';
+export declare function setLogger(value: Logger): void;
+export declare function setLoggerName(value: any): void;
+export declare function getLogger(caller?: string): Logger;

package/lib/getLogger.js

@@ -0,0 +1,34 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLogger = exports.setLoggerName = exports.setLogger = void 0;
+const pinomin_1 = __importDefault(require("pinomin"));
+let _logger;
+let _name = null;
+const defaultLogger = (0, pinomin_1.default)({
+    base: { pid: (_a = global === null || global === void 0 ? void 0 : global.process) === null || _a === void 0 ? void 0 : _a.pid },
+    targets: [{ type: 'console', level: 'info' }],
+});
+function setLogger(value) {
+    _logger = value;
+}
+exports.setLogger = setLogger;
+function setLoggerName(value) {
+    _name = value;
+}
+exports.setLoggerName = setLoggerName;
+function getLogger(caller) {
+    let res = _logger || defaultLogger;
+    if (caller) {
+        const props = { caller };
+        if (_name) {
+            props['name'] = _name;
+        }
+        res = res.child(props);
+    }
+    return res;
+}
+exports.getLogger = getLogger;

package/lib/index.d.ts

@@ -18,3 +18,4 @@ export * from './stringTools';
 export * from './computeDiffRows';
 export * from './preloadedRowsTools';
 export * from './ScriptWriter';
+export * from './getLogger';

package/lib/index.js

@@ -34,3 +34,4 @@ __exportStar(require("./stringTools"), exports);
 __exportStar(require("./computeDiffRows"), exports);
 __exportStar(require("./preloadedRowsTools"), exports);
 __exportStar(require("./ScriptWriter"), exports);
+__exportStar(require("./getLogger"), exports);

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.2.1",
+  "version": "5.2.2-alpha.11",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -25,17 +25,18 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^5.2.1",
+    "dbgate-types": "^5.2.2-alpha.11",
     "jest": "^24.9.0",
     "ts-jest": "^25.2.1",
     "typescript": "^4.4.3"
   },
   "dependencies": {
     "dbgate-query-splitter": "^4.9.3",
-    "dbgate-sqltree": "^5.2.1",
+    "dbgate-sqltree": "^5.2.2-alpha.11",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",
+    "pinomin": "^1.0.1",
     "uuid": "^3.4.0"
   }
 }