dbgate-tools 5.2.8 → 5.3.0

package/lib/DatabaseAnalyser.d.ts

@@ -1,4 +1,5 @@
 import { DatabaseInfo, DatabaseModification, EngineDriver, SqlDialect } from 'dbgate-types';
+import { type Logger } from 'pinomin';
 export declare class DatabaseAnalyser {
     pool: any;
     driver: EngineDriver;
@@ -7,6 +8,7 @@ export declare class DatabaseAnalyser {
     singleObjectFilter: any;
     singleObjectId: string;
     dialect: SqlDialect;
+    logger: Logger;
     constructor(pool: any, driver: EngineDriver, version: any);
     _runAnalysis(): Promise<DatabaseInfo>;
     _getFastSnapshot(): Promise<DatabaseInfo>;
@@ -17,13 +19,14 @@ export declare class DatabaseAnalyser {
     incrementalAnalysis(structure: any): Promise<DatabaseInfo>;
     mergeAnalyseResult(newlyAnalysed: any): any;
     getRequestedObjectPureNames(objectTypeField: any, allPureNames: any): any;
-    createQuery(template: any, typeFields: any): any;
+    createQuery(template: any, typeFields: any, replacements?: {}): any;
+    processQueryReplacements(query: any, replacements: 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[]>;
-    analyserQuery(template: any, typeFields: any): Promise<import("dbgate-types").QueryResult>;
+    analyserQuery(template: any, typeFields: any, replacements?: {}): 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

@@ -42,6 +42,7 @@ class DatabaseAnalyser {
         this.driver = driver;
         this.singleObjectId = null;
         this.dialect = ((driver === null || driver === void 0 ? void 0 : driver.dialectByVersion) && (driver === null || driver === void 0 ? void 0 : driver.dialectByVersion(version))) || (driver === null || driver === void 0 ? void 0 : driver.dialect);
+        this.logger = logger;
     }
     _runAnalysis() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -170,8 +171,14 @@ class DatabaseAnalyser {
     // containsObjectIdCondition(typeFields) {
     //   return this.createQueryCore('=OBJECT_ID_CONDITION', typeFields) != ' is not null';
     // }
-    createQuery(template, typeFields) {
-        return this.createQueryCore(template, typeFields);
+    createQuery(template, typeFields, replacements = {}) {
+        return this.createQueryCore(this.processQueryReplacements(template, replacements), typeFields);
+    }
+    processQueryReplacements(query, replacements) {
+        for (const repl in replacements) {
+            query = query.replaceAll(repl, replacements[repl]);
+        }
+        return query;
     }
     createQueryCore(template, typeFields) {
         // let res = template;
@@ -287,16 +294,18 @@ class DatabaseAnalyser {
             return [...(0, compact_1.default)(res), ...this.getDeletedObjects(snapshot)];
         });
     }
-    analyserQuery(template, typeFields) {
+    analyserQuery(template, typeFields, replacements = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            const sql = this.createQuery(template, typeFields);
+            const sql = this.createQuery(template, typeFields, replacements);
             if (!sql) {
                 return {
                     rows: [],
                 };
             }
             try {
-                return yield this.driver.query(this.pool, sql);
+                const res = yield this.driver.query(this.pool, sql);
+                this.logger.debug({ rows: res.rows.length, template }, `Loaded analyser query`);
+                return res;
             }
             catch (err) {
                 logger.error({ err }, 'Error running analyser query');

package/lib/SqlDumper.d.ts

@@ -22,6 +22,7 @@ export declare class SqlDumper implements AlterProcessor {
     dropDatabase(name: string): void;
     specialColumnOptions(column: any): void;
     selectScopeIdentity(table: TableInfo): void;
+    columnType(dataType: string): void;
     columnDefinition(column: ColumnInfo, { includeDefault, includeNullable, includeCollate }?: {
         includeDefault?: boolean;
         includeNullable?: boolean;

package/lib/SqlDumper.js

@@ -184,15 +184,8 @@ class SqlDumper {
     }
     specialColumnOptions(column) { }
     selectScopeIdentity(table) { }
-    columnDefinition(column, { includeDefault = true, includeNullable = true, includeCollate = true } = {}) {
-        var _a;
-        if (column.computedExpression) {
-            this.put('^as %s', column.computedExpression);
-            if (column.isPersisted)
-                this.put(' ^persisted');
-            return;
-        }
-        const type = column.dataType || this.dialect.fallbackDataType;
+    columnType(dataType) {
+        const type = dataType || this.dialect.fallbackDataType;
         const typeWithValues = type.match(/([^(]+)(\(.+[^)]\))/);
         if (typeWithValues === null || typeWithValues === void 0 ? void 0 : typeWithValues.length) {
             typeWithValues.shift();
@@ -202,6 +195,16 @@ class SqlDumper {
         else {
             this.putRaw(SqlDumper.convertKeywordCase(type));
         }
+    }
+    columnDefinition(column, { includeDefault = true, includeNullable = true, includeCollate = true } = {}) {
+        var _a;
+        if (column.computedExpression) {
+            this.put('^as %s', column.computedExpression);
+            if (column.isPersisted)
+                this.put(' ^persisted');
+            return;
+        }
+        this.columnType(column.dataType);
         if (column.autoIncrement) {
             this.autoIncrement();
         }

package/lib/createBulkInsertStreamBase.js

@@ -59,23 +59,42 @@ function createBulkInsertStreamBase(driver, stream, pool, name, options) {
     writable.send = () => __awaiter(this, void 0, void 0, function* () {
         const rows = writable.buffer;
         writable.buffer = [];
-        const dmp = driver.createDumper();
-        dmp.putRaw(`INSERT INTO ${fullNameQuoted} (`);
-        dmp.putCollection(',', writable.columnNames, col => dmp.putRaw(driver.dialect.quoteIdentifier(col)));
-        dmp.putRaw(')\n VALUES\n');
-        let wasRow = false;
-        for (const row of rows) {
-            if (wasRow)
-                dmp.putRaw(',\n');
-            dmp.putRaw('(');
-            dmp.putCollection(',', writable.columnNames, col => dmp.putValue(row[col]));
-            dmp.putRaw(')');
-            wasRow = true;
+        if (driver.dialect.allowMultipleValuesInsert) {
+            const dmp = driver.createDumper();
+            dmp.putRaw(`INSERT INTO ${fullNameQuoted} (`);
+            dmp.putCollection(',', writable.columnNames, col => dmp.putRaw(driver.dialect.quoteIdentifier(col)));
+            dmp.putRaw(')\n VALUES\n');
+            let wasRow = false;
+            for (const row of rows) {
+                if (wasRow)
+                    dmp.putRaw(',\n');
+                dmp.putRaw('(');
+                dmp.putCollection(',', writable.columnNames, col => dmp.putValue(row[col]));
+                dmp.putRaw(')');
+                wasRow = true;
+            }
+            dmp.putRaw(';');
+            // require('fs').writeFileSync('/home/jena/test.sql', dmp.s);
+            // console.log(dmp.s);
+            yield driver.query(pool, dmp.s, { discardResult: true });
+        }
+        else {
+            for (const row of rows) {
+                const dmp = driver.createDumper();
+                dmp.putRaw(`INSERT INTO ${fullNameQuoted} (`);
+                dmp.putCollection(',', writable.columnNames, col => dmp.putRaw(driver.dialect.quoteIdentifier(col)));
+                dmp.putRaw(')\n VALUES\n');
+                dmp.putRaw('(');
+                dmp.putCollection(',', writable.columnNames, col => dmp.putValue(row[col]));
+                dmp.putRaw(')');
+                yield driver.query(pool, dmp.s, { discardResult: true });
+            }
+        }
+        if (options.commitAfterInsert) {
+            const dmp = driver.createDumper();
+            dmp.commitTransaction();
+            yield driver.query(pool, dmp.s, { discardResult: true });
         }
-        dmp.putRaw(';');
-        // require('fs').writeFileSync('/home/jena/test.sql', dmp.s);
-        // console.log(dmp.s);
-        yield driver.query(pool, dmp.s, { discardResult: true });
     });
     writable.sendIfFull = () => __awaiter(this, void 0, void 0, function* () {
         if (writable.buffer.length > 100) {

package/lib/getLogger.d.ts

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

package/lib/getLogger.js

@@ -4,31 +4,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLogger = exports.setLoggerName = exports.setLogger = void 0;
+exports.getLogger = exports.setLoggerName = exports.setLogConfig = void 0;
 const pinomin_1 = __importDefault(require("pinomin"));
-let _logger;
+let _logConfig;
 let _name = null;
-const defaultLogger = (0, pinomin_1.default)({
+const defaultLogConfig = {
     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;
+};
+function setLogConfig(value) {
+    _logConfig = value;
 }
-exports.setLogger = setLogger;
+exports.setLogConfig = setLogConfig;
 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;
+    return (0, pinomin_1.default)({
+        getConfig: () => {
+            const config = _logConfig || defaultLogConfig;
+            if (caller) {
+                const props = { caller };
+                if (_name) {
+                    props['name'] = _name;
+                }
+                return Object.assign(Object.assign({}, config), { base: Object.assign(Object.assign({}, config.base), props) });
+            }
+            return config;
+        },
+    });
 }
 exports.getLogger = getLogger;

package/package.json

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