dbgate-tools 5.5.7-alpha.16 → 5.5.7-alpha.26

package/lib/DatabaseAnalyser.js

@@ -75,7 +75,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}`);
+            logger.debug(`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;

package/lib/ScriptWriter.js

@@ -52,7 +52,7 @@ class ScriptWriter {
         this._put(`await dbgateApi.importDatabase(${JSON.stringify(options)});`);
     }
     dataDuplicator(options) {
-        this._put(`await dbgateApi.dataDuplicator(${JSON.stringify(options)});`);
+        this._put(`await dbgateApi.dataDuplicator(${JSON.stringify(options, null, 2)});`);
     }
     comment(s) {
         this._put(`// ${s}`);

package/lib/SqlDumper.js

@@ -473,6 +473,9 @@ class SqlDumper {
             this.put('%i %k', col.columnName, col.isDescending == true ? 'DESC' : 'ASC');
         });
         this.put('&<&n)');
+        if (ix.filterDefinition && this.dialect.filteredIndexes) {
+            this.put('&n^where %s', ix.filterDefinition);
+        }
         this.endCommand();
     }
     dropUnique(uq) {

package/lib/alterPlan.d.ts

@@ -56,6 +56,7 @@ interface AlterOperation_ChangeConstraint {
 interface AlterOperation_DropConstraint {
     operationType: 'dropConstraint';
     oldObject: ConstraintInfo;
+    isRecreate?: boolean;
 }
 interface AlterOperation_RenameConstraint {
     operationType: 'renameConstraint';
@@ -82,7 +83,7 @@ interface AlterOperation_SetTableOption {
     optionName: string;
     optionValue: string;
 }
-type AlterOperation = AlterOperation_CreateColumn | AlterOperation_ChangeColumn | AlterOperation_DropColumn | AlterOperation_CreateConstraint | AlterOperation_ChangeConstraint | AlterOperation_DropConstraint | AlterOperation_CreateTable | AlterOperation_DropTable | AlterOperation_RenameTable | AlterOperation_RenameColumn | AlterOperation_RenameConstraint | AlterOperation_CreateSqlObject | AlterOperation_DropSqlObject | AlterOperation_RecreateTable | AlterOperation_FillPreloadedRows | AlterOperation_SetTableOption | AlterOperation_RenameSqlObject;
+export type AlterOperation = AlterOperation_CreateColumn | AlterOperation_ChangeColumn | AlterOperation_DropColumn | AlterOperation_CreateConstraint | AlterOperation_ChangeConstraint | AlterOperation_DropConstraint | AlterOperation_CreateTable | AlterOperation_DropTable | AlterOperation_RenameTable | AlterOperation_RenameColumn | AlterOperation_RenameConstraint | AlterOperation_CreateSqlObject | AlterOperation_DropSqlObject | AlterOperation_RecreateTable | AlterOperation_FillPreloadedRows | AlterOperation_SetTableOption | AlterOperation_RenameSqlObject;
 export declare class AlterPlan {
     wholeOldDb: DatabaseInfo;
     wholeNewDb: DatabaseInfo;

package/lib/alterPlan.js

@@ -184,14 +184,15 @@ class AlterPlan {
             ]) {
                 if (op.operationType == testedOperationType) {
                     const constraints = this._getDependendColumnConstraints(testedObject, testedDependencies);
-                    if (constraints.length > 0 && this.opts.noDropConstraint) {
-                        return [];
-                    }
+                    // if (constraints.length > 0 && this.opts.noDropConstraint) {
+                    //   return [];
+                    // }
                     const res = [
                         ...constraints.map(oldObject => {
                             const opRes = {
                                 operationType: 'dropConstraint',
                                 oldObject,
+                                isRecreate: true,
                             };
                             return opRes;
                         }),
@@ -225,14 +226,15 @@ class AlterPlan {
                 ];
             }
             if (op.operationType == 'changeConstraint') {
-                if (this.opts.noDropConstraint) {
-                    // skip constraint recreate
-                    return [];
-                }
+                // if (this.opts.noDropConstraint) {
+                //   // skip constraint recreate
+                //   return [];
+                // }
                 this.recreates.constraints += 1;
                 const opDrop = {
                     operationType: 'dropConstraint',
                     oldObject: op.oldObject,
+                    isRecreate: true,
                 };
                 const opCreate = {
                     operationType: 'createConstraint',
@@ -374,7 +376,7 @@ class AlterPlan {
                 return false;
             if (this.opts.noDropTable && op.operationType == 'recreateTable')
                 return false;
-            if (this.opts.noDropConstraint && op.operationType == 'dropConstraint')
+            if (this.opts.noDropConstraint && op.operationType == 'dropConstraint' && !op.isRecreate)
                 return false;
             // if (
             //   this.opts.noDropSqlObject &&

package/lib/computeDiffRows.d.ts

@@ -1,5 +1,6 @@
 import { DbDiffOptions, testEqualTables, testEqualSqlObjects } from './diffTools';
 import type { DatabaseInfo, EngineDriver, SqlObjectInfo, TableInfo } from 'dbgate-types';
+import { AlterOperation } from './alterPlan';
 export declare function computeDiffRowsCore(sourceList: any, targetList: any, testEqual: any): any[];
 export declare const DbDiffCompareDefs: {
     tables: {
@@ -35,4 +36,16 @@ export declare const DbDiffCompareDefs: {
 };
 export declare function computeDbDiffRows(sourceDb: DatabaseInfo, targetDb: DatabaseInfo, opts: DbDiffOptions, driver: EngineDriver): any[];
 export declare function computeTableDiffColumns(sourceTable: TableInfo, targetTable: TableInfo, opts: DbDiffOptions, driver: EngineDriver): any[];
+export interface DiffOperationItemDisplay {
+    operationType: string;
+    name: string;
+    sqlScript: string;
+    identifier?: string;
+}
+export declare function getOperationDisplay(operation: AlterOperation, driver: EngineDriver): DiffOperationItemDisplay;
+export declare function computeObjectDiffOperations(sourceObject: {
+    objectTypeField: string;
+}, targetObject: {
+    objectTypeField: string;
+}, sourceDb: DatabaseInfo, targetDb: DatabaseInfo, opts: DbDiffOptions, driver: EngineDriver): DiffOperationItemDisplay[];
 export declare function getCreateObjectScript(obj: TableInfo | SqlObjectInfo, driver: EngineDriver): string;

package/lib/computeDiffRows.js

@@ -3,9 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCreateObjectScript = exports.computeTableDiffColumns = exports.computeDbDiffRows = exports.DbDiffCompareDefs = exports.computeDiffRowsCore = void 0;
+exports.getCreateObjectScript = exports.computeObjectDiffOperations = exports.getOperationDisplay = exports.computeTableDiffColumns = exports.computeDbDiffRows = exports.DbDiffCompareDefs = exports.computeDiffRowsCore = void 0;
 const diffTools_1 = require("./diffTools");
 const lodash_1 = __importDefault(require("lodash"));
+const structureTools_1 = require("./structureTools");
+const alterPlan_1 = require("./alterPlan");
 function computeDiffRowsCore(sourceList, targetList, testEqual) {
     const res = [];
     for (const obj of sourceList) {
@@ -95,6 +97,33 @@ function computeTableDiffColumns(sourceTable, targetTable, opts, driver) {
     });
 }
 exports.computeTableDiffColumns = computeTableDiffColumns;
+function getOperationDisplay(operation, driver) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+    const op = operation;
+    const name = (_u = (_s = (_q = (_o = (_l = (_j = (_g = (_e = (_c = (_a = op === null || op === void 0 ? void 0 : op.newName) !== null && _a !== void 0 ? _a : (_b = op === null || op === void 0 ? void 0 : op.newObject) === null || _b === void 0 ? void 0 : _b.columnName) !== null && _c !== void 0 ? _c : (_d = op === null || op === void 0 ? void 0 : op.newObject) === null || _d === void 0 ? void 0 : _d.constraintName) !== null && _e !== void 0 ? _e : (_f = op === null || op === void 0 ? void 0 : op.newObject) === null || _f === void 0 ? void 0 : _f.pureName) !== null && _g !== void 0 ? _g : (_h = op === null || op === void 0 ? void 0 : op.oldObject) === null || _h === void 0 ? void 0 : _h.columnName) !== null && _j !== void 0 ? _j : (_k = op === null || op === void 0 ? void 0 : op.oldObject) === null || _k === void 0 ? void 0 : _k.constraintName) !== null && _l !== void 0 ? _l : (_m = op === null || op === void 0 ? void 0 : op.oldObject) === null || _m === void 0 ? void 0 : _m.pureName) !== null && _o !== void 0 ? _o : (_p = op === null || op === void 0 ? void 0 : op.table) === null || _p === void 0 ? void 0 : _p.pureName) !== null && _q !== void 0 ? _q : (_r = op === null || op === void 0 ? void 0 : op.object) === null || _r === void 0 ? void 0 : _r.columnName) !== null && _s !== void 0 ? _s : (_t = op === null || op === void 0 ? void 0 : op.object) === null || _t === void 0 ? void 0 : _t.constraintName) !== null && _u !== void 0 ? _u : (_v = op === null || op === void 0 ? void 0 : op.object) === null || _v === void 0 ? void 0 : _v.pureName;
+    const dmp = driver.createDumper();
+    (0, alterPlan_1.runAlterOperation)(operation, dmp);
+    return {
+        operationType: operation.operationType,
+        name,
+        sqlScript: dmp.s,
+        identifier: dmp.s,
+    };
+}
+exports.getOperationDisplay = getOperationDisplay;
+function computeObjectDiffOperations(sourceObject, targetObject, sourceDb, targetDb, opts, driver) {
+    if (!driver)
+        return [];
+    const srcdb = sourceObject
+        ? (0, structureTools_1.extendDatabaseInfo)({ [sourceObject.objectTypeField]: [sourceObject] })
+        : (0, structureTools_1.extendDatabaseInfo)({});
+    const dstdb = targetObject
+        ? (0, structureTools_1.extendDatabaseInfo)({ [targetObject.objectTypeField]: [targetObject] })
+        : (0, structureTools_1.extendDatabaseInfo)({});
+    const plan = (0, diffTools_1.createAlterDatabasePlan)(dstdb, srcdb, opts, targetDb, sourceDb, driver);
+    return plan.operations.map(item => getOperationDisplay(item, driver));
+}
+exports.computeObjectDiffOperations = computeObjectDiffOperations;
 function getCreateObjectScript(obj, driver) {
     if (!obj || !driver)
         return '';

package/lib/diffTools.d.ts

@@ -41,7 +41,7 @@ export declare function getAlterTableScript(oldTable: TableInfo, newTable: Table
         sqlObjects: number;
     };
 };
-export declare function getAlterDatabaseScript(oldDb: DatabaseInfo, newDb: DatabaseInfo, opts: DbDiffOptions, wholeOldDb: DatabaseInfo, wholeNewDb: DatabaseInfo, driver: EngineDriver): {
+export declare function getAlterDatabaseScript(oldDb: DatabaseInfo, newDb: DatabaseInfo, opts: DbDiffOptions, wholeOldDb: DatabaseInfo, wholeNewDb: DatabaseInfo, driver: EngineDriver, transformPlan?: (plan: AlterPlan) => void): {
     sql: string;
     recreates: {
         tables: number;

package/lib/diffTools.js

@@ -6,14 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.modelCompareDbDiffOptions = exports.matchPairedObjects = exports.getAlterDatabaseScript = exports.getAlterTableScript = exports.createAlterDatabasePlan = exports.createAlterTablePlan = exports.testEqualSqlObjects = exports.testEqualTables = exports.testEqualTypes = exports.testEqualColumns = exports.hasDeletedPrefix = exports.generateDbPairingId = exports.removeTablePairingId = exports.generateTablePairingId = void 0;
 const v1_1 = __importDefault(require("uuid/v1"));
 const alterPlan_1 = require("./alterPlan");
-const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
 const toposort_1 = __importDefault(require("toposort"));
-const omit_1 = __importDefault(require("lodash/omit"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const isEqual_1 = __importDefault(require("lodash/isEqual"));
 const pick_1 = __importDefault(require("lodash/pick"));
 const compact_1 = __importDefault(require("lodash/compact"));
 const isString_1 = __importDefault(require("lodash/isString"));
+const structureTools_1 = require("./structureTools");
 function generateTablePairingId(table) {
     var _a, _b, _c, _d, _e;
     if (!table)
@@ -31,6 +30,12 @@ function removeTablePairingId(table) {
     return Object.assign(Object.assign({}, table), { columns: (_a = table.columns) === null || _a === void 0 ? void 0 : _a.map(col => (Object.assign(Object.assign({}, col), { pairingId: undefined }))), foreignKeys: (_b = table.foreignKeys) === null || _b === void 0 ? void 0 : _b.map(cnt => (Object.assign(Object.assign({}, cnt), { pairingId: undefined }))), checks: (_c = table.checks) === null || _c === void 0 ? void 0 : _c.map(cnt => (Object.assign(Object.assign({}, cnt), { pairingId: undefined }))), indexes: (_d = table.indexes) === null || _d === void 0 ? void 0 : _d.map(cnt => (Object.assign(Object.assign({}, cnt), { pairingId: undefined }))), uniques: (_e = table.uniques) === null || _e === void 0 ? void 0 : _e.map(cnt => (Object.assign(Object.assign({}, cnt), { pairingId: undefined }))), pairingId: undefined });
 }
 exports.removeTablePairingId = removeTablePairingId;
+function simplifySqlExpression(sql) {
+    return (sql || '')
+        .replace(/[\s\(\)\[\]\"]/g, '')
+        .toLowerCase()
+        .trim();
+}
 function generateObjectPairingId(obj) {
     if (obj.objectTypeField)
         return Object.assign(Object.assign({}, obj), { pairingId: obj.pairingId || (0, v1_1.default)() });
@@ -216,19 +221,86 @@ function testEqualColumns(a, b, checkName, checkDefault, opts = {}) {
     return true;
 }
 exports.testEqualColumns = testEqualColumns;
-function testEqualConstraints(a, b, opts = {}) {
-    const omitList = [];
-    if (opts.ignoreForeignKeyActions) {
-        omitList.push('updateAction');
-        omitList.push('deleteAction');
-    }
-    if (opts.ignoreConstraintNames) {
-        omitList.push('constraintName');
+function testEqualColumnRefs(a, b, opts) {
+    if (a.length != b.length)
+        return false;
+    for (let i = 0; i < a.length; i++) {
+        if (!testEqualNames(a[i].columnName, b[i].columnName, opts))
+            return false;
+        if (!testEqualNames(a[i].refColumnName, b[i].refColumnName, opts))
+            return false;
     }
-    if (opts.schemaMode == 'ignore') {
-        omitList.push('schemaName');
-        omitList.push('refSchemaName');
+    return true;
+}
+function testEqualPrimaryKeys(a, b, opts) {
+    if (!testEqualColumnRefs(a.columns, b.columns, opts))
+        return false;
+    return true;
+}
+function testEqualForeignKeys(a, b, opts) {
+    if (!testEqualColumnRefs(a.columns, b.columns, opts))
+        return false;
+    if (!opts.ignoreConstraintNames && !testEqualNames(a.constraintName, b.constraintName, opts))
+        return false;
+    return true;
+}
+function testEqualIndex(a, b, opts) {
+    if (!testEqualColumnRefs(a.columns, b.columns, opts))
+        return false;
+    if (!!a.isUnique != !!b.isUnique)
+        return false;
+    if (simplifySqlExpression(a.filterDefinition) != simplifySqlExpression(b.filterDefinition))
+        return false;
+    if (!opts.ignoreConstraintNames && !testEqualNames(a.constraintName, b.constraintName, opts))
+        return false;
+    return true;
+}
+function testEqualUnique(a, b, opts) {
+    if (!testEqualColumnRefs(a.columns, b.columns, opts))
+        return false;
+    if (!opts.ignoreConstraintNames && !testEqualNames(a.constraintName, b.constraintName, opts))
+        return false;
+    return true;
+}
+function testEqualCheck(a, b, opts) {
+    if (a.definition != b.definition)
+        return false;
+    if (!opts.ignoreConstraintNames && !testEqualNames(a.constraintName, b.constraintName, opts))
+        return false;
+    return true;
+}
+function testEqualConstraints(a, b, opts = {}) {
+    if (a.constraintType != b.constraintType) {
+        console.debug(`Constraint ${a.pureName}: different constraint type: ${a.constraintType}, ${b.constraintType}`);
+        return false;
     }
+    switch (a.constraintType) {
+        case 'primaryKey':
+        case 'sortingKey':
+            return testEqualPrimaryKeys(a, b, opts);
+        case 'foreignKey':
+            return testEqualForeignKeys(a, b, opts);
+        case 'index':
+            return testEqualIndex(a, b, opts);
+        case 'unique':
+            return testEqualUnique(a, b, opts);
+        case 'check':
+            return testEqualCheck(a, b, opts);
+    }
+    console.debug(`Unknown constraint type: ${a.pureName}`);
+    return false;
+    // const omitList = ['pairingId'];
+    // if (opts.ignoreForeignKeyActions) {
+    //   omitList.push('updateAction');
+    //   omitList.push('deleteAction');
+    // }
+    // if (opts.ignoreConstraintNames) {
+    //   omitList.push('constraintName');
+    // }
+    // if (opts.schemaMode == 'ignore') {
+    //   omitList.push('schemaName');
+    //   omitList.push('refSchemaName');
+    // }
     // if (a.constraintType == 'primaryKey' && b.constraintType == 'primaryKey') {
     //   console.log('PK1', stableStringify(_.omit(a, omitList)));
     //   console.log('PK2', stableStringify(_.omit(b, omitList)));
@@ -241,13 +313,15 @@ function testEqualConstraints(a, b, opts = {}) {
     //   console.log('IX1', stableStringify(_omit(a, omitList)));
     //   console.log('IX2', stableStringify(_omit(b, omitList)));
     // }
-    return (0, json_stable_stringify_1.default)((0, omit_1.default)(a, omitList)) == (0, json_stable_stringify_1.default)((0, omit_1.default)(b, omitList));
+    // const aStringified = stableStringify(_omit(a, omitList));
+    // const bStringified = stableStringify(_omit(b, omitList));
+    // return aStringified == bStringified;
 }
 function testEqualTypes(a, b, opts = {}) {
     if (opts.ignoreDataTypes) {
         return true;
     }
-    if ((a.dataType || '').toLowerCase() != (b.dataType || '').toLowerCase()) {
+    if (simplifySqlExpression(a.dataType) != simplifySqlExpression(b.dataType)) {
         console.debug(`Column ${a.pureName}.${a.columnName}, ${b.pureName}.${b.columnName}: different data type: ${a.dataType}, ${b.dataType}`);
         return false;
     }
@@ -291,7 +365,7 @@ function createPairs(oldList, newList, additionalCondition = null) {
 function planTablePreload(plan, oldTable, newTable) {
     var _a, _b, _c, _d;
     const key = newTable.preloadedRowsKey || ((_b = (_a = newTable.primaryKey) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.map(x => x.columnName));
-    if (((_c = newTable.preloadedRows) === null || _c === void 0 ? void 0 : _c.length) > 0 && (key === null || key === void 0 ? void 0 : key.length) > 0) {
+    if (((_c = newTable.preloadedRows) === null || _c === void 0 ? void 0 : _c.length) > 0 && (key === null || key === void 0 ? void 0 : key.length) > 0 && (0, structureTools_1.detectChangesInPreloadedRows)(oldTable, newTable)) {
         plan.fillPreloadedRows(newTable, oldTable === null || oldTable === void 0 ? void 0 : oldTable.preloadedRows, newTable.preloadedRows, key, newTable.preloadedRowsInsertOnly, (_d = newTable.columns.find(x => x.autoIncrement)) === null || _d === void 0 ? void 0 : _d.columnName);
     }
 }
@@ -357,7 +431,6 @@ function planAlterTable(plan, oldTable, newTable, opts) {
         }
     });
     constraintPairs.filter(x => x[0] == null).forEach(x => plan.createConstraint(x[1]));
-    planTablePreload(plan, oldTable, newTable);
     planChangeTableOptions(plan, oldTable, newTable, opts);
     // console.log('oldTable', oldTable);
     // console.log('newTable', newTable);
@@ -380,8 +453,16 @@ function planChangeTableOptions(plan, oldTable, newTable, opts) {
 function testEqualTables(a, b, opts, wholeOldDb, wholeNewDb, driver) {
     const plan = new alterPlan_1.AlterPlan(wholeOldDb, wholeNewDb, driver.dialect, opts);
     planAlterTable(plan, a, b, opts);
-    // console.log('plan.operations', a, b, plan.operations);
-    return plan.operations.length == 0;
+    // if (plan.operations.length > 0) {
+    //   console.log('************** plan.operations', a, b, plan.operations);
+    // }
+    if (plan.operations.length > 0) {
+        return false;
+    }
+    if ((0, structureTools_1.detectChangesInPreloadedRows)(a, b)) {
+        return false;
+    }
+    return true;
 }
 exports.testEqualTables = testEqualTables;
 function testEqualSqlObjects(a, b, opts) {
@@ -400,6 +481,7 @@ function createAlterTablePlan(oldTable, newTable, opts, wholeOldDb, wholeNewDb,
     }
     else {
         planAlterTable(plan, oldTable, newTable, opts);
+        planTablePreload(plan, oldTable, newTable);
     }
     plan.transformPlan();
     return plan;
@@ -451,6 +533,7 @@ function createAlterDatabasePlan(oldDb, newDb, opts, wholeOldDb, wholeNewDb, dri
                 }
                 else {
                     planAlterTable(plan, oldobj, newobj, opts);
+                    planTablePreload(plan, oldobj, newobj);
                 }
             }
             else {
@@ -512,8 +595,11 @@ function getAlterTableScript(oldTable, newTable, opts, wholeOldDb, wholeNewDb, d
     };
 }
 exports.getAlterTableScript = getAlterTableScript;
-function getAlterDatabaseScript(oldDb, newDb, opts, wholeOldDb, wholeNewDb, driver) {
+function getAlterDatabaseScript(oldDb, newDb, opts, wholeOldDb, wholeNewDb, driver, transformPlan = null) {
     const plan = createAlterDatabasePlan(oldDb, newDb, opts, wholeOldDb, wholeNewDb, driver);
+    if (transformPlan) {
+        transformPlan(plan);
+    }
     const dmp = driver.createDumper({ useHardSeparator: true });
     plan.run(dmp);
     return {
@@ -563,7 +649,6 @@ function matchPairedObjects(db1, db2, opts) {
 exports.matchPairedObjects = matchPairedObjects;
 exports.modelCompareDbDiffOptions = {
     ignoreCase: true,
-    schemaMode: 'ignore',
     ignoreConstraintNames: true,
     ignoreForeignKeyActions: true,
     ignoreDataTypes: true,

package/lib/driverBase.js

@@ -93,7 +93,7 @@ exports.driverBase = {
             for (const sqlItem of (0, dbgate_query_splitter_1.splitQuery)(sql, this.getQuerySplitterOptions('script'))) {
                 try {
                     if (options === null || options === void 0 ? void 0 : options.logScriptItems) {
-                        logger.info({ sql: (0, stringTools_1.getLimitedQuery)(sqlItem) }, `Execute script item`);
+                        logger.info({ sql: (0, stringTools_1.getLimitedQuery)(sqlItem) }, 'Execute script item');
                     }
                     yield this.query(pool, sqlItem, Object.assign({ discardResult: true }, options === null || options === void 0 ? void 0 : options.queryOptions));
                 }

package/lib/stringTools.d.ts

@@ -33,3 +33,4 @@ export declare function extractErrorLogData(err: any, additionalFields?: {}): {
 };
 export declare function safeFormatDate(date: any): any;
 export declare function getLimitedQuery(sql: string): string;
+export declare function pinoLogRecordToMessageRecord(logRecord: any, defaultSeverity?: string): any;

package/lib/stringTools.js

@@ -1,9 +1,20 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLimitedQuery = exports.safeFormatDate = exports.extractErrorLogData = exports.extractErrorStackTrace = exports.extractErrorMessage = exports.getConvertValueMenu = exports.detectTypeIcon = exports.detectCellDataType = exports.parseSqlDefaultValue = exports.getAsImageSrc = exports.arrayBufferToBase64 = exports.isWktGeometry = exports.getIconForRedisType = exports.isJsonLikeLongString = exports.shouldOpenMultilineDialog = exports.safeJsonParse = exports.stringifyCellValue = exports.parseCellValue = exports.hexStringToArray = exports.arrayToHexString = void 0;
+exports.pinoLogRecordToMessageRecord = exports.getLimitedQuery = exports.safeFormatDate = exports.extractErrorLogData = exports.extractErrorStackTrace = exports.extractErrorMessage = exports.getConvertValueMenu = exports.detectTypeIcon = exports.detectCellDataType = exports.parseSqlDefaultValue = exports.getAsImageSrc = exports.arrayBufferToBase64 = exports.isWktGeometry = exports.getIconForRedisType = exports.isJsonLikeLongString = exports.shouldOpenMultilineDialog = exports.safeJsonParse = exports.stringifyCellValue = exports.parseCellValue = exports.hexStringToArray = exports.arrayToHexString = void 0;
 const isString_1 = __importDefault(require("lodash/isString"));
 const isArray_1 = __importDefault(require("lodash/isArray"));
 const isDate_1 = __importDefault(require("lodash/isDate"));
@@ -499,3 +510,17 @@ function getLimitedQuery(sql) {
     return sql;
 }
 exports.getLimitedQuery = getLimitedQuery;
+function pinoLogRecordToMessageRecord(logRecord, defaultSeverity = 'info') {
+    var _a;
+    const { level, time, msg } = logRecord, rest = __rest(logRecord, ["level", "time", "msg"]);
+    const levelToSeverity = {
+        10: 'debug',
+        20: 'debug',
+        30: 'info',
+        40: 'info',
+        50: 'error',
+        60: 'error',
+    };
+    return Object.assign(Object.assign({}, rest), { time, message: msg, severity: (_a = levelToSeverity[level]) !== null && _a !== void 0 ? _a : defaultSeverity });
+}
+exports.pinoLogRecordToMessageRecord = pinoLogRecordToMessageRecord;

package/lib/structureTools.d.ts

@@ -13,3 +13,19 @@ export declare function isViewInfo(obj: {
 export declare function isCollectionInfo(obj: {
     objectTypeField?: string;
 }): obj is CollectionInfo;
+export declare function filterStructureBySchema(db: DatabaseInfo, schema: string): DatabaseInfo;
+export declare function getSchemasUsedByStructure(db: DatabaseInfo): string[] | DatabaseInfo;
+export declare function replaceSchemaInStructure(db: DatabaseInfo, schema: string): DatabaseInfo;
+export declare function skipNamesInStructureByRegex(db: DatabaseInfo, regex: RegExp): DatabaseInfo;
+export declare function detectChangesInPreloadedRows(oldTable: TableInfo, newTable: TableInfo): boolean;
+export declare function removePreloadedRowsFromStructure(db: DatabaseInfo): DatabaseInfo;
+export declare function skipDbGateInternalObjects(db: DatabaseInfo): {
+    tables: TableInfo[];
+    engine?: string;
+    collections: CollectionInfo[];
+    views: ViewInfo[];
+    matviews: ViewInfo[];
+    procedures: import("dbgate-types").ProcedureInfo[];
+    functions: import("dbgate-types").FunctionInfo[];
+    triggers: import("dbgate-types").TriggerInfo[];
+};

package/lib/structureTools.js

@@ -3,8 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCollectionInfo = exports.isViewInfo = exports.isTableInfo = exports.isTableColumnUnique = exports.extendDatabaseInfoFromApps = exports.extendDatabaseInfo = exports.extendTableInfo = exports.addTableDependencies = void 0;
+exports.skipDbGateInternalObjects = exports.removePreloadedRowsFromStructure = exports.detectChangesInPreloadedRows = exports.skipNamesInStructureByRegex = exports.replaceSchemaInStructure = exports.getSchemasUsedByStructure = exports.filterStructureBySchema = exports.isCollectionInfo = exports.isViewInfo = exports.isTableInfo = exports.isTableColumnUnique = exports.extendDatabaseInfoFromApps = exports.extendDatabaseInfo = exports.extendTableInfo = exports.addTableDependencies = void 0;
 const flatten_1 = __importDefault(require("lodash/flatten"));
+const uniq_1 = __importDefault(require("lodash/uniq"));
+const keys_1 = __importDefault(require("lodash/keys"));
 function addTableDependencies(db) {
     if (!db.tables) {
         return db;
@@ -61,3 +63,89 @@ function isCollectionInfo(obj) {
     return obj.objectTypeField == 'collections';
 }
 exports.isCollectionInfo = isCollectionInfo;
+function filterStructureBySchema(db, schema) {
+    if (!db) {
+        return db;
+    }
+    return Object.assign(Object.assign({}, db), { tables: (db.tables || []).filter(x => x.schemaName == schema), views: (db.views || []).filter(x => x.schemaName == schema), collections: (db.collections || []).filter(x => x.schemaName == schema), matviews: (db.matviews || []).filter(x => x.schemaName == schema), procedures: (db.procedures || []).filter(x => x.schemaName == schema), functions: (db.functions || []).filter(x => x.schemaName == schema), triggers: (db.triggers || []).filter(x => x.schemaName == schema) });
+}
+exports.filterStructureBySchema = filterStructureBySchema;
+function getSchemasUsedByStructure(db) {
+    if (!db) {
+        return db;
+    }
+    return (0, uniq_1.default)([
+        ...(db.tables || []).map(x => x.schemaName),
+        ...(db.views || []).map(x => x.schemaName),
+        ...(db.collections || []).map(x => x.schemaName),
+        ...(db.matviews || []).map(x => x.schemaName),
+        ...(db.procedures || []).map(x => x.schemaName),
+        ...(db.functions || []).map(x => x.schemaName),
+        ...(db.triggers || []).map(x => x.schemaName),
+    ]);
+}
+exports.getSchemasUsedByStructure = getSchemasUsedByStructure;
+function replaceSchemaInStructure(db, schema) {
+    if (!db) {
+        return db;
+    }
+    return Object.assign(Object.assign({}, db), { tables: (db.tables || []).map(tbl => (Object.assign(Object.assign({}, tbl), { schemaName: schema, columns: (tbl.columns || []).map(column => (Object.assign(Object.assign({}, column), { schemaName: schema }))), primaryKey: tbl.primaryKey ? Object.assign(Object.assign({}, tbl.primaryKey), { schemaName: schema }) : undefined, sortingKey: tbl.sortingKey ? Object.assign(Object.assign({}, tbl.sortingKey), { schemaName: schema }) : undefined, foreignKeys: (tbl.foreignKeys || []).map(fk => (Object.assign(Object.assign({}, fk), { refSchemaName: schema, schemaName: schema }))), indexes: (tbl.indexes || []).map(idx => (Object.assign(Object.assign({}, idx), { schemaName: schema }))), uniques: (tbl.uniques || []).map(idx => (Object.assign(Object.assign({}, idx), { schemaName: schema }))), checks: (tbl.checks || []).map(idx => (Object.assign(Object.assign({}, idx), { schemaName: schema }))) }))), views: (db.views || []).map(x => (Object.assign(Object.assign({}, x), { schemaName: schema }))), collections: (db.collections || []).map(x => (Object.assign(Object.assign({}, x), { schemaName: schema }))), matviews: (db.matviews || []).map(x => (Object.assign(Object.assign({}, x), { schemaName: schema }))), procedures: (db.procedures || []).map(x => (Object.assign(Object.assign({}, x), { schemaName: schema }))), functions: (db.functions || []).map(x => (Object.assign(Object.assign({}, x), { schemaName: schema }))), triggers: (db.triggers || []).map(x => (Object.assign(Object.assign({}, x), { schemaName: schema }))) });
+}
+exports.replaceSchemaInStructure = replaceSchemaInStructure;
+function skipNamesInStructureByRegex(db, regex) {
+    if (!db) {
+        return db;
+    }
+    return Object.assign(Object.assign({}, db), { tables: (db.tables || []).filter(tbl => !regex.test(tbl.pureName)), views: (db.views || []).filter(tbl => !regex.test(tbl.pureName)), collections: (db.collections || []).filter(tbl => !regex.test(tbl.pureName)), matviews: (db.matviews || []).filter(tbl => !regex.test(tbl.pureName)), procedures: (db.procedures || []).filter(tbl => !regex.test(tbl.pureName)), functions: (db.functions || []).filter(tbl => !regex.test(tbl.pureName)), triggers: (db.triggers || []).filter(tbl => !regex.test(tbl.pureName)) });
+}
+exports.skipNamesInStructureByRegex = skipNamesInStructureByRegex;
+function detectChangesInPreloadedRows(oldTable, newTable) {
+    var _a, _b, _c, _d;
+    const key = (newTable === null || newTable === void 0 ? void 0 : newTable.preloadedRowsKey) ||
+        (oldTable === null || oldTable === void 0 ? void 0 : oldTable.preloadedRowsKey) ||
+        ((_b = (_a = newTable === null || newTable === void 0 ? void 0 : newTable.primaryKey) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.map(x => x.columnName)) ||
+        ((_d = (_c = oldTable === null || oldTable === void 0 ? void 0 : oldTable.primaryKey) === null || _c === void 0 ? void 0 : _c.columns) === null || _d === void 0 ? void 0 : _d.map(x => x.columnName));
+    const oldRows = (oldTable === null || oldTable === void 0 ? void 0 : oldTable.preloadedRows) || [];
+    const newRows = (newTable === null || newTable === void 0 ? void 0 : newTable.preloadedRows) || [];
+    const insertOnly = (newTable === null || newTable === void 0 ? void 0 : newTable.preloadedRowsInsertOnly) || (oldTable === null || oldTable === void 0 ? void 0 : oldTable.preloadedRowsInsertOnly);
+    if (newRows.length != oldRows.length) {
+        return true;
+    }
+    for (const row of newRows) {
+        const old = oldRows === null || oldRows === void 0 ? void 0 : oldRows.find(r => key.every(col => r[col] == row[col]));
+        const rowKeys = (0, keys_1.default)(row);
+        if (old) {
+            const updated = [];
+            for (const col of rowKeys) {
+                if (row[col] != old[col] && !(insertOnly === null || insertOnly === void 0 ? void 0 : insertOnly.includes(col))) {
+                    updated.push(col);
+                }
+            }
+            if (updated.length > 0) {
+                return true;
+            }
+        }
+        else {
+            return true;
+        }
+    }
+    for (const row of oldRows || []) {
+        const newr = oldRows === null || oldRows === void 0 ? void 0 : oldRows.find(r => key.every(col => r[col] == row[col]));
+        if (!newr) {
+            return true;
+        }
+    }
+    return false;
+}
+exports.detectChangesInPreloadedRows = detectChangesInPreloadedRows;
+function removePreloadedRowsFromStructure(db) {
+    if (!db) {
+        return db;
+    }
+    return Object.assign(Object.assign({}, db), { tables: (db.tables || []).map(tbl => (Object.assign(Object.assign({}, tbl), { preloadedRows: undefined, preloadedRowsKey: undefined, preloadedRowsInsertOnly: undefined }))) });
+}
+exports.removePreloadedRowsFromStructure = removePreloadedRowsFromStructure;
+function skipDbGateInternalObjects(db) {
+    return Object.assign(Object.assign({}, db), { tables: (db.tables || []).filter(tbl => tbl.pureName != 'dbgate_deploy_journal') });
+}
+exports.skipDbGateInternalObjects = skipDbGateInternalObjects;

package/lib/yamlModelConv.d.ts

@@ -16,11 +16,19 @@ export interface DatabaseModelFile {
     text: string;
     json: {};
 }
+export interface IndexInfoYaml {
+    name: string;
+    unique?: boolean;
+    filter?: string;
+    columns: string[];
+    included?: string[];
+}
 export interface TableInfoYaml {
     name: string;
     columns: ColumnInfoYaml[];
     primaryKey?: string[];
     sortingKey?: string[];
+    indexes?: IndexInfoYaml[];
     insertKey?: string[];
     insertOnly?: string[];
     data?: any[];

package/lib/yamlModelConv.js

@@ -46,6 +46,7 @@ function columnInfoFromYaml(column, table) {
     return res;
 }
 function tableInfoToYaml(table) {
+    var _a;
     const tableCopy = (0, cloneDeep_1.default)(table);
     const res = {
         name: tableCopy.pureName,
@@ -59,6 +60,20 @@ function tableInfoToYaml(table) {
         res.sortingKey = tableCopy.sortingKey.columns.map(x => x.columnName);
     }
     // const foreignKeys = (tableCopy.foreignKeys || []).filter(x => !x['_dumped']).map(foreignKeyInfoToYaml);
+    if (((_a = tableCopy.indexes) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+        res.indexes = tableCopy.indexes.map(index => {
+            const idx = {
+                name: index.constraintName,
+                unique: index.isUnique,
+                filter: index.filterDefinition,
+                columns: index.columns.filter(x => !x.isIncludedColumn).map(x => x.columnName),
+            };
+            if (index.columns.some(x => x.isIncludedColumn)) {
+                idx.included = index.columns.filter(x => x.isIncludedColumn).map(x => x.columnName);
+            }
+            return idx;
+        });
+    }
     return res;
 }
 exports.tableInfoToYaml = tableInfoToYaml;
@@ -82,10 +97,22 @@ function convertForeignKeyFromYaml(col, table, allTables) {
     };
 }
 function tableInfoFromYaml(table, allTables) {
+    var _a;
     const res = {
         pureName: table.name,
         columns: table.columns.map(c => columnInfoFromYaml(c, table)),
         foreignKeys: (0, compact_1.default)(table.columns.filter(x => x.references).map(col => convertForeignKeyFromYaml(col, table, allTables))),
+        indexes: (_a = table.indexes) === null || _a === void 0 ? void 0 : _a.map(index => ({
+            constraintName: index.name,
+            pureName: table.name,
+            isUnique: index.unique,
+            constraintType: 'index',
+            filterDefinition: index.filter,
+            columns: [
+                ...index.columns.map(columnName => ({ columnName })),
+                ...(index.included || []).map(columnName => ({ columnName, isIncludedColumn: true })),
+            ],
+        })),
     };
     if (table.primaryKey) {
         res.primaryKey = {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.5.7-alpha.16",
+  "version": "5.5.7-alpha.26",
   "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.7-alpha.16",
+    "dbgate-types": "^5.5.7-alpha.26",
     "jest": "^24.9.0",
     "ts-jest": "^25.2.1",
     "typescript": "^4.4.3"
   },
   "dependencies": {
     "dbgate-query-splitter": "^4.11.2",
-    "dbgate-sqltree": "^5.5.7-alpha.16",
+    "dbgate-sqltree": "^5.5.7-alpha.26",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",