dbgate-tools 4.4.0-alpha.2 → 4.4.3

package/lib/SqlDumper.d.ts

@@ -101,4 +101,5 @@ export declare class SqlDumper implements AlterProcessor {
     createSqlObject(obj: SqlObjectInfo): void;
     getSqlObjectSqlName(ojectTypeField: string): "PROCEDURE" | "VIEW" | "FUNCTION" | "TRIGGER" | "MATERIALIZED VIEW";
     dropSqlObject(obj: SqlObjectInfo): void;
+    fillPreloadedRows(table: NamedObjectInfo, oldRows: any[], newRows: any[], key: string[]): void;
 }

package/lib/SqlDumper.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqlDumper = void 0;
+const lodash_1 = __importDefault(require("lodash"));
 const isString_1 = __importDefault(require("lodash/isString"));
 const isNumber_1 = __importDefault(require("lodash/isNumber"));
 const isDate_1 = __importDefault(require("lodash/isDate"));
@@ -531,5 +532,38 @@ class SqlDumper {
     dropSqlObject(obj) {
         this.putCmd('^drop %s %f', this.getSqlObjectSqlName(obj.objectTypeField), obj);
     }
+    fillPreloadedRows(table, oldRows, newRows, key) {
+        let was = false;
+        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 = lodash_1.default.keys(row);
+            if (old) {
+                const updated = [];
+                for (const col of rowKeys) {
+                    if (row[col] != old[col]) {
+                        updated.push(col);
+                    }
+                }
+                if (updated.length > 0) {
+                    if (was)
+                        this.put(';\n');
+                    was = true;
+                    this.put('^update %f ^set ', table);
+                    this.putCollection(', ', updated, col => this.put('%i=%v', col, row[col]));
+                    this.put(' ^where ');
+                    this.putCollection(' ^and ', key, col => this.put('%i=%v', col, row[col]));
+                }
+            }
+            else {
+                if (was)
+                    this.put(';\n');
+                was = true;
+                this.put('^insert ^into %f (%,i) ^values (%,v)', table, rowKeys, rowKeys.map(x => row[x]));
+            }
+        }
+        if (was) {
+            this.endCommand();
+        }
+    }
 }
 exports.SqlDumper = SqlDumper;

package/lib/alterPlan.d.ts

@@ -1,5 +1,5 @@
 import { DbDiffOptions } from './diffTools';
-import { AlterProcessor, ColumnInfo, ConstraintInfo, DatabaseInfo, SqlObjectInfo, SqlDialect, TableInfo } from '../../types';
+import { AlterProcessor, ColumnInfo, ConstraintInfo, DatabaseInfo, SqlObjectInfo, SqlDialect, TableInfo, NamedObjectInfo } from '../../types';
 interface AlterOperation_CreateTable {
     operationType: 'createTable';
     newObject: TableInfo;
@@ -62,9 +62,17 @@ interface AlterOperation_RecreateTable {
     table: TableInfo;
     operations: AlterOperation[];
 }
-declare 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;
+interface AlterOperation_FillPreloadedRows {
+    operationType: 'fillPreloadedRows';
+    table: NamedObjectInfo;
+    oldRows: any[];
+    newRows: any[];
+    key: string[];
+}
+declare 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;
 export declare class AlterPlan {
-    db: DatabaseInfo;
+    wholeOldDb: DatabaseInfo;
+    wholeNewDb: DatabaseInfo;
     dialect: SqlDialect;
     opts: DbDiffOptions;
     recreates: {
@@ -73,7 +81,7 @@ export declare class AlterPlan {
         sqlObjects: number;
     };
     operations: AlterOperation[];
-    constructor(db: DatabaseInfo, dialect: SqlDialect, opts: DbDiffOptions);
+    constructor(wholeOldDb: DatabaseInfo, wholeNewDb: DatabaseInfo, dialect: SqlDialect, opts: DbDiffOptions);
     createTable(table: TableInfo): void;
     dropTable(table: TableInfo): void;
     createSqlObject(obj: SqlObjectInfo): void;
@@ -88,6 +96,7 @@ export declare class AlterPlan {
     renameColumn(column: ColumnInfo, newName: string): void;
     renameConstraint(constraint: ConstraintInfo, newName: string): void;
     recreateTable(table: TableInfo, operations: AlterOperation[]): void;
+    fillPreloadedRows(table: NamedObjectInfo, oldRows: any[], newRows: any[], key: string[]): void;
     run(processor: AlterProcessor): void;
     _getDependendColumnConstraints(column: ColumnInfo, dependencyDefinition: any): import("dbgate-types/dbinfo").PrimaryKeyInfo[];
     _addLogicalDependencies(): AlterOperation[];

package/lib/alterPlan.js

@@ -9,8 +9,9 @@ const diffTools_1 = require("./diffTools");
 const database_info_alter_processor_1 = require("./database-info-alter-processor");
 const DatabaseAnalyser_1 = require("./DatabaseAnalyser");
 class AlterPlan {
-    constructor(db, dialect, opts) {
-        this.db = db;
+    constructor(wholeOldDb, wholeNewDb, dialect, opts) {
+        this.wholeOldDb = wholeOldDb;
+        this.wholeNewDb = wholeNewDb;
         this.dialect = dialect;
         this.opts = opts;
         this.recreates = {
@@ -111,13 +112,24 @@ class AlterPlan {
         });
         this.recreates.tables += 1;
     }
+    fillPreloadedRows(table, oldRows, newRows, key) {
+        this.operations.push({
+            operationType: 'fillPreloadedRows',
+            table,
+            oldRows,
+            newRows,
+            key,
+        });
+    }
     run(processor) {
         for (const op of this.operations) {
             runAlterOperation(op, processor);
         }
     }
     _getDependendColumnConstraints(column, dependencyDefinition) {
-        const table = this.db.tables.find(x => x.pureName == column.pureName && x.schemaName == column.schemaName);
+        const table = this.wholeOldDb.tables.find(x => x.pureName == column.pureName && x.schemaName == column.schemaName);
+        if (!table)
+            return [];
         const fks = (dependencyDefinition === null || dependencyDefinition === void 0 ? void 0 : dependencyDefinition.includes('dependencies'))
             ? table.dependencies.filter(fk => fk.columns.find(col => col.refColumnName == column.columnName))
             : [];
@@ -261,7 +273,7 @@ class AlterPlan {
                 // skip this operation, as it cannot be achieved
                 return [];
             }
-            const table = this.db.tables.find(x => x.pureName == op[objectField].pureName && x.schemaName == op[objectField].schemaName);
+            const table = this.wholeNewDb.tables.find(x => x.pureName == op[objectField].pureName && x.schemaName == op[objectField].schemaName);
             this.recreates.tables += 1;
             return [
                 {
@@ -394,6 +406,9 @@ function runAlterOperation(op, processor) {
         case 'dropSqlObject':
             processor.dropSqlObject(op.oldObject);
             break;
+        case 'fillPreloadedRows':
+            processor.fillPreloadedRows(op.table, op.oldRows, op.newRows, op.key);
+            break;
         case 'recreateTable':
             {
                 const oldTable = (0, diffTools_1.generateTablePairingId)(op.table);

package/lib/computeDiffRows.d.ts

@@ -0,0 +1,38 @@
+import { DbDiffOptions, testEqualTables, testEqualSqlObjects } from './diffTools';
+import { DatabaseInfo, EngineDriver, SqlObjectInfo, TableInfo } from 'dbgate-types';
+export declare function computeDiffRowsCore(sourceList: any, targetList: any, testEqual: any): any[];
+export declare const DbDiffCompareDefs: {
+    tables: {
+        test: typeof testEqualTables;
+        name: string;
+        plural: string;
+        icon: string;
+    };
+    views: {
+        test: typeof testEqualSqlObjects;
+        name: string;
+        plural: string;
+        icon: string;
+    };
+    matviews: {
+        test: typeof testEqualSqlObjects;
+        name: string;
+        plural: string;
+        icon: string;
+    };
+    procedures: {
+        test: typeof testEqualSqlObjects;
+        name: string;
+        plural: string;
+        icon: string;
+    };
+    functions: {
+        test: typeof testEqualSqlObjects;
+        name: string;
+        plural: string;
+        icon: string;
+    };
+};
+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 declare function getCreateObjectScript(obj: TableInfo | SqlObjectInfo, driver: EngineDriver): string;

package/lib/computeDiffRows.js

@@ -0,0 +1,108 @@
+"use strict";
+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;
+const diffTools_1 = require("./diffTools");
+const lodash_1 = __importDefault(require("lodash"));
+function computeDiffRowsCore(sourceList, targetList, testEqual) {
+    const res = [];
+    for (const obj of sourceList) {
+        const paired = targetList.find(x => x.pairingId == obj.pairingId);
+        if (paired) {
+            const isEqual = testEqual(obj, paired);
+            res.push({
+                source: obj,
+                target: paired,
+                state: isEqual ? 'equal' : 'changed',
+                __isChanged: !isEqual,
+            });
+        }
+        else {
+            res.push({
+                source: obj,
+                state: 'added',
+                __isAdded: true,
+            });
+        }
+    }
+    for (const obj of targetList) {
+        const paired = sourceList.find(x => x.pairingId == obj.pairingId);
+        if (!paired) {
+            res.push({
+                target: obj,
+                state: 'removed',
+                __isDeleted: true,
+            });
+        }
+    }
+    return res;
+}
+exports.computeDiffRowsCore = computeDiffRowsCore;
+exports.DbDiffCompareDefs = {
+    tables: {
+        test: diffTools_1.testEqualTables,
+        name: 'Table',
+        plural: 'Tables',
+        icon: 'img table',
+    },
+    views: {
+        test: diffTools_1.testEqualSqlObjects,
+        name: 'View',
+        plural: 'Views',
+        icon: 'img view',
+    },
+    matviews: {
+        test: diffTools_1.testEqualSqlObjects,
+        name: 'Materialized view',
+        plural: 'Materialized views',
+        icon: 'img view',
+    },
+    procedures: {
+        test: diffTools_1.testEqualSqlObjects,
+        name: 'Procedure',
+        plural: 'Procedures',
+        icon: 'img procedure',
+    },
+    functions: {
+        test: diffTools_1.testEqualSqlObjects,
+        name: 'Function',
+        plural: 'Functions',
+        icon: 'img function',
+    },
+};
+function computeDbDiffRows(sourceDb, targetDb, opts, driver) {
+    if (!sourceDb || !targetDb || !driver)
+        return [];
+    const res = [];
+    for (const objectTypeField of ['tables', 'views', 'procedures', 'matviews', 'functions']) {
+        const defs = exports.DbDiffCompareDefs[objectTypeField];
+        res.push(...lodash_1.default.sortBy(computeDiffRowsCore(sourceDb[objectTypeField], targetDb[objectTypeField], (a, b) => defs.test(a, b, opts, sourceDb, targetDb, driver)).map(row => {
+            var _a, _b, _c, _d, _e, _f, _g, _h;
+            return (Object.assign(Object.assign({}, row), { sourceSchemaName: (_a = row === null || row === void 0 ? void 0 : row.source) === null || _a === void 0 ? void 0 : _a.schemaName, sourcePureName: (_b = row === null || row === void 0 ? void 0 : row.source) === null || _b === void 0 ? void 0 : _b.pureName, targetSchemaName: (_c = row === null || row === void 0 ? void 0 : row.target) === null || _c === void 0 ? void 0 : _c.schemaName, targetPureName: (_d = row === null || row === void 0 ? void 0 : row.target) === null || _d === void 0 ? void 0 : _d.pureName, typeName: defs.name, typeIcon: defs.icon, identifier: `${((_e = row === null || row === void 0 ? void 0 : row.source) === null || _e === void 0 ? void 0 : _e.schemaName) || ((_f = row === null || row === void 0 ? void 0 : row.target) === null || _f === void 0 ? void 0 : _f.schemaName)}.${((_g = row === null || row === void 0 ? void 0 : row.source) === null || _g === void 0 ? void 0 : _g.pureName) || ((_h = row === null || row === void 0 ? void 0 : row.target) === null || _h === void 0 ? void 0 : _h.pureName)}`, objectTypeField }));
+        }), 'identifier'));
+    }
+    return res;
+}
+exports.computeDbDiffRows = computeDbDiffRows;
+function computeTableDiffColumns(sourceTable, targetTable, opts, driver) {
+    if (!driver)
+        return [];
+    return computeDiffRowsCore((sourceTable === null || sourceTable === void 0 ? void 0 : sourceTable.columns) || [], (targetTable === null || targetTable === void 0 ? void 0 : targetTable.columns) || [], (a, b) => (0, diffTools_1.testEqualColumns)(a, b, true, true, opts)).map(row => {
+        var _a, _b, _c, _d, _e, _f;
+        return (Object.assign(Object.assign({}, row), { sourceColumnName: (_a = row === null || row === void 0 ? void 0 : row.source) === null || _a === void 0 ? void 0 : _a.columnName, targetColumnName: (_b = row === null || row === void 0 ? void 0 : row.target) === null || _b === void 0 ? void 0 : _b.columnName, sourceDataType: (_c = row === null || row === void 0 ? void 0 : row.source) === null || _c === void 0 ? void 0 : _c.dataType, targetDataType: (_d = row === null || row === void 0 ? void 0 : row.target) === null || _d === void 0 ? void 0 : _d.dataType, sourceNotNull: (_e = row === null || row === void 0 ? void 0 : row.source) === null || _e === void 0 ? void 0 : _e.notNull, targetNotNull: (_f = row === null || row === void 0 ? void 0 : row.target) === null || _f === void 0 ? void 0 : _f.notNull }));
+    });
+}
+exports.computeTableDiffColumns = computeTableDiffColumns;
+function getCreateObjectScript(obj, driver) {
+    if (!obj || !driver)
+        return '';
+    if (obj.objectTypeField == 'tables') {
+        const dmp = driver.createDumper();
+        dmp.createTable(obj);
+        return dmp.s;
+    }
+    return obj.createSql || '';
+}
+exports.getCreateObjectScript = getCreateObjectScript;

package/lib/database-info-alter-processor.d.ts

@@ -1,4 +1,4 @@
-import { ColumnInfo, ConstraintInfo, DatabaseInfo, TableInfo, SqlObjectInfo } from '../../types';
+import { ColumnInfo, ConstraintInfo, DatabaseInfo, TableInfo, SqlObjectInfo, NamedObjectInfo } from '../../types';
 export declare class DatabaseInfoAlterProcessor {
     db: DatabaseInfo;
     constructor(db: DatabaseInfo);
@@ -16,4 +16,5 @@ export declare class DatabaseInfoAlterProcessor {
     renameColumn(column: ColumnInfo, newName: string): void;
     renameConstraint(constraint: ConstraintInfo, newName: string): void;
     recreateTable(oldTable: TableInfo, newTable: TableInfo): void;
+    fillPreloadedRows(table: NamedObjectInfo, oldRows: any[], newRows: any[], key: string[]): void;
 }

package/lib/database-info-alter-processor.js

@@ -93,5 +93,10 @@ class DatabaseInfoAlterProcessor {
     recreateTable(oldTable, newTable) {
         throw new Error('recreateTable not implemented for DatabaseInfoAlterProcessor');
     }
+    fillPreloadedRows(table, oldRows, newRows, key) {
+        const tableInfo = this.db.tables.find(x => x.pureName == table.pureName && x.schemaName == table.schemaName);
+        tableInfo.preloadedRows = newRows;
+        tableInfo.preloadedRowsKey = key;
+    }
 }
 exports.DatabaseInfoAlterProcessor = DatabaseInfoAlterProcessor;

package/lib/diffTools.d.ts

@@ -1,4 +1,4 @@
-import { ColumnInfo, DatabaseInfo, EngineDriver, TableInfo } from 'dbgate-types';
+import { ColumnInfo, DatabaseInfo, EngineDriver, SqlObjectInfo, TableInfo } from 'dbgate-types';
 import { AlterPlan } from './alterPlan';
 declare type DbDiffSchemaMode = 'strict' | 'ignore' | 'ignoreImplicit';
 export interface DbDiffOptions {
@@ -20,10 +20,11 @@ export declare function generateTablePairingId(table: TableInfo): TableInfo;
 export declare function generateDbPairingId(db: DatabaseInfo): DatabaseInfo;
 export declare function testEqualColumns(a: ColumnInfo, b: ColumnInfo, checkName: boolean, checkDefault: boolean, opts?: DbDiffOptions): boolean;
 export declare function testEqualTypes(a: ColumnInfo, b: ColumnInfo, opts?: DbDiffOptions): boolean;
-export declare function testEqualTables(a: TableInfo, b: TableInfo, opts: DbDiffOptions, db: DatabaseInfo, driver: EngineDriver): boolean;
-export declare function createAlterTablePlan(oldTable: TableInfo, newTable: TableInfo, opts: DbDiffOptions, db: DatabaseInfo, driver: EngineDriver): AlterPlan;
-export declare function createAlterDatabasePlan(oldDb: DatabaseInfo, newDb: DatabaseInfo, opts: DbDiffOptions, db: DatabaseInfo, driver: EngineDriver): AlterPlan;
-export declare function getAlterTableScript(oldTable: TableInfo, newTable: TableInfo, opts: DbDiffOptions, db: DatabaseInfo, driver: EngineDriver): {
+export declare function testEqualTables(a: TableInfo, b: TableInfo, opts: DbDiffOptions, wholeOldDb: DatabaseInfo, wholeNewDb: DatabaseInfo, driver: EngineDriver): boolean;
+export declare function testEqualSqlObjects(a: SqlObjectInfo, b: SqlObjectInfo, opts: DbDiffOptions): boolean;
+export declare function createAlterTablePlan(oldTable: TableInfo, newTable: TableInfo, opts: DbDiffOptions, wholeOldDb: DatabaseInfo, wholeNewDb: DatabaseInfo, driver: EngineDriver): AlterPlan;
+export declare function createAlterDatabasePlan(oldDb: DatabaseInfo, newDb: DatabaseInfo, opts: DbDiffOptions, wholeOldDb: DatabaseInfo, wholeNewDb: DatabaseInfo, driver: EngineDriver): AlterPlan;
+export declare function getAlterTableScript(oldTable: TableInfo, newTable: TableInfo, opts: DbDiffOptions, wholeOldDb: DatabaseInfo, wholeNewDb: DatabaseInfo, driver: EngineDriver): {
     sql: string;
     recreates: any[];
 } | {
@@ -34,7 +35,7 @@ export declare function getAlterTableScript(oldTable: TableInfo, newTable: Table
         sqlObjects: number;
     };
 };
-export declare function getAlterDatabaseScript(oldDb: DatabaseInfo, newDb: DatabaseInfo, opts: DbDiffOptions, db: DatabaseInfo, driver: EngineDriver): {
+export declare function getAlterDatabaseScript(oldDb: DatabaseInfo, newDb: DatabaseInfo, opts: DbDiffOptions, wholeOldDb: DatabaseInfo, wholeNewDb: DatabaseInfo, driver: EngineDriver): {
     sql: string;
     recreates: {
         tables: number;
@@ -44,4 +45,5 @@ export declare function getAlterDatabaseScript(oldDb: DatabaseInfo, newDb: Datab
     isEmpty: boolean;
 };
 export declare function matchPairedObjects(db1: DatabaseInfo, db2: DatabaseInfo, opts: DbDiffOptions): DatabaseInfo;
+export declare const modelCompareDbDiffOptions: DbDiffOptions;
 export {};

package/lib/diffTools.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.matchPairedObjects = exports.getAlterDatabaseScript = exports.getAlterTableScript = exports.createAlterDatabasePlan = exports.createAlterTablePlan = exports.testEqualTables = exports.testEqualTypes = exports.testEqualColumns = exports.generateDbPairingId = exports.generateTablePairingId = void 0;
+exports.modelCompareDbDiffOptions = exports.matchPairedObjects = exports.getAlterDatabaseScript = exports.getAlterTableScript = exports.createAlterDatabasePlan = exports.createAlterTablePlan = exports.testEqualSqlObjects = exports.testEqualTables = exports.testEqualTypes = exports.testEqualColumns = exports.generateDbPairingId = 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"));
@@ -185,6 +185,10 @@ function testEqualConstraints(a, b, opts = {}) {
     //   console.log('FK1', stableStringify(_omit(a, omitList)));
     //   console.log('FK2', stableStringify(_omit(b, omitList)));
     // }
+    // if (a.constraintType == 'index' && b.constraintType == 'index') {
+    //   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));
 }
 function testEqualTypes(a, b, opts = {}) {
@@ -230,10 +234,19 @@ function createPairs(oldList, newList, additionalCondition = null) {
     }
     return res;
 }
+function planTablePreload(plan, oldTable, newTable) {
+    var _a, _b, _c;
+    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) {
+        plan.fillPreloadedRows(newTable, oldTable === null || oldTable === void 0 ? void 0 : oldTable.preloadedRows, newTable.preloadedRows, key);
+    }
+}
 function planAlterTable(plan, oldTable, newTable, opts) {
     // if (oldTable.primaryKey)
     const columnPairs = createPairs(oldTable.columns, newTable.columns);
     const constraintPairs = createPairs(getTableConstraints(oldTable), getTableConstraints(newTable), (a, b) => a.constraintType == 'primaryKey' && b.constraintType == 'primaryKey');
+    // console.log('constraintPairs SOURCE', getTableConstraints(oldTable), getTableConstraints(newTable));
+    // console.log('constraintPairs', constraintPairs);
     if (!opts.noDropConstraint) {
         constraintPairs.filter(x => x[1] == null).forEach(x => plan.dropConstraint(x[0]));
     }
@@ -267,18 +280,24 @@ function planAlterTable(plan, oldTable, newTable, opts) {
         }
     });
     constraintPairs.filter(x => x[0] == null).forEach(x => plan.createConstraint(x[1]));
+    planTablePreload(plan, oldTable, newTable);
 }
-function testEqualTables(a, b, opts, db, driver) {
-    const plan = new alterPlan_1.AlterPlan(db, driver.dialect, 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;
 }
 exports.testEqualTables = testEqualTables;
-function createAlterTablePlan(oldTable, newTable, opts, db, driver) {
-    const plan = new alterPlan_1.AlterPlan(db, driver.dialect, opts);
+function testEqualSqlObjects(a, b, opts) {
+    return a.createSql == b.createSql;
+}
+exports.testEqualSqlObjects = testEqualSqlObjects;
+function createAlterTablePlan(oldTable, newTable, opts, wholeOldDb, wholeNewDb, driver) {
+    const plan = new alterPlan_1.AlterPlan(wholeOldDb, wholeNewDb, driver.dialect, opts);
     if (oldTable == null) {
         plan.createTable(newTable);
+        planTablePreload(plan, null, newTable);
     }
     else if (newTable == null) {
         plan.dropTable(oldTable);
@@ -290,8 +309,8 @@ function createAlterTablePlan(oldTable, newTable, opts, db, driver) {
     return plan;
 }
 exports.createAlterTablePlan = createAlterTablePlan;
-function createAlterDatabasePlan(oldDb, newDb, opts, db, driver) {
-    const plan = new alterPlan_1.AlterPlan(db, driver.dialect, opts);
+function createAlterDatabasePlan(oldDb, newDb, opts, wholeOldDb, wholeNewDb, driver) {
+    const plan = new alterPlan_1.AlterPlan(wholeOldDb, wholeNewDb, driver.dialect, opts);
     for (const objectTypeField of ['tables', 'views', 'procedures', 'matviews', 'functions']) {
         for (const oldobj of oldDb[objectTypeField] || []) {
             const newobj = (newDb[objectTypeField] || []).find(x => x.pairingId == oldobj.pairingId);
@@ -311,7 +330,7 @@ function createAlterDatabasePlan(oldDb, newDb, opts, db, driver) {
                         plan.dropSqlObject(oldobj);
                     }
                 }
-                else if (newobj.createSql != oldobj.createSql) {
+                else if (!testEqualSqlObjects(oldobj.createSql, newobj.createSql, opts)) {
                     plan.recreates.sqlObjects += 1;
                     if (!opts.noDropSqlObject) {
                         plan.dropSqlObject(oldobj);
@@ -323,8 +342,10 @@ function createAlterDatabasePlan(oldDb, newDb, opts, db, driver) {
         for (const newobj of newDb[objectTypeField] || []) {
             const oldobj = (oldDb[objectTypeField] || []).find(x => x.pairingId == newobj.pairingId);
             if (objectTypeField == 'tables') {
-                if (oldobj == null)
+                if (oldobj == null) {
                     plan.createTable(newobj);
+                    planTablePreload(plan, null, newobj);
+                }
             }
             else {
                 if (oldobj == null)
@@ -336,12 +357,12 @@ function createAlterDatabasePlan(oldDb, newDb, opts, db, driver) {
     return plan;
 }
 exports.createAlterDatabasePlan = createAlterDatabasePlan;
-function getAlterTableScript(oldTable, newTable, opts, db, driver) {
+function getAlterTableScript(oldTable, newTable, opts, wholeOldDb, wholeNewDb, driver) {
     if ((!oldTable && !newTable) || !driver) {
         return { sql: '', recreates: [] };
     }
-    const plan = createAlterTablePlan(oldTable, newTable, opts, db, driver);
-    const dmp = driver.createDumper();
+    const plan = createAlterTablePlan(oldTable, newTable, opts, wholeOldDb, wholeNewDb, driver);
+    const dmp = driver.createDumper({ useHardSeparator: true });
     if (!driver.dialect.disableExplicitTransaction)
         dmp.beginTransaction();
     plan.run(dmp);
@@ -353,9 +374,9 @@ function getAlterTableScript(oldTable, newTable, opts, db, driver) {
     };
 }
 exports.getAlterTableScript = getAlterTableScript;
-function getAlterDatabaseScript(oldDb, newDb, opts, db, driver) {
-    const plan = createAlterDatabasePlan(oldDb, newDb, opts, db, driver);
-    const dmp = driver.createDumper();
+function getAlterDatabaseScript(oldDb, newDb, opts, wholeOldDb, wholeNewDb, driver) {
+    const plan = createAlterDatabasePlan(oldDb, newDb, opts, wholeOldDb, wholeNewDb, driver);
+    const dmp = driver.createDumper({ useHardSeparator: true });
     if (!driver.dialect.disableExplicitTransaction)
         dmp.beginTransaction();
     plan.run(dmp);
@@ -389,6 +410,16 @@ function matchPairedObjects(db1, db2, opts) {
                         if (fk1)
                             fk2.pairingId = fk1.pairingId;
                     }
+                    for (const uq2 of obj2.uniques) {
+                        const uq1 = obj1.uniques.find(x => (0, isEqual_1.default)(x.columns.map(y => (0, pick_1.default)(y, ['columnName'])), uq2.columns.map(y => (0, pick_1.default)(y, ['columnName']))));
+                        if (uq1)
+                            uq2.pairingId = uq1.pairingId;
+                    }
+                    for (const ix2 of obj2.indexes) {
+                        const ix1 = obj1.indexes.find(x => testEqualNames(x.constraintName, ix2.constraintName, opts));
+                        if (ix1)
+                            ix2.pairingId = ix1.pairingId;
+                    }
                 }
             }
         }
@@ -396,3 +427,10 @@ function matchPairedObjects(db1, db2, opts) {
     return res;
 }
 exports.matchPairedObjects = matchPairedObjects;
+exports.modelCompareDbDiffOptions = {
+    ignoreCase: true,
+    schemaMode: 'ignore',
+    ignoreConstraintNames: true,
+    ignoreForeignKeyActions: true,
+    ignoreDataTypes: true,
+};

package/lib/driverBase.d.ts

@@ -14,6 +14,6 @@ export declare const driverBase: {
     analyseSingleObject(pool: any, name: any, typeField?: string): Promise<any>;
     analyseSingleTable(pool: any, name: any): any;
     analyseIncremental(pool: any, structure: any, version: any): Promise<any>;
-    createDumper(): any;
+    createDumper(options?: any): any;
     script(pool: any, sql: any): Promise<void>;
 };

package/lib/driverBase.js

@@ -47,8 +47,8 @@ exports.driverBase = {
             return analyser.incrementalAnalysis(structure);
         });
     },
-    createDumper() {
-        return new this.dumperClass(this);
+    createDumper(options = null) {
+        return new this.dumperClass(this, options);
     },
     script(pool, sql) {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/index.d.ts

@@ -15,3 +15,5 @@ export * from './diffTools';
 export * from './schemaEditorTools';
 export * from './yamlModelConv';
 export * from './stringTools';
+export * from './computeDiffRows';
+export * from './preloadedRowsTools';

package/lib/index.js

@@ -27,3 +27,5 @@ __exportStar(require("./diffTools"), exports);
 __exportStar(require("./schemaEditorTools"), exports);
 __exportStar(require("./yamlModelConv"), exports);
 __exportStar(require("./stringTools"), exports);
+__exportStar(require("./computeDiffRows"), exports);
+__exportStar(require("./preloadedRowsTools"), exports);

package/lib/preloadedRowsTools.d.ts

@@ -0,0 +1,2 @@
+import { DatabaseInfo, EngineDriver } from 'dbgate-types';
+export declare function enrichWithPreloadedRows(dbModel: DatabaseInfo, dbTarget: DatabaseInfo, conn: any, driver: EngineDriver): Promise<DatabaseInfo>;

package/lib/preloadedRowsTools.js

@@ -0,0 +1,50 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.enrichWithPreloadedRows = void 0;
+const lodash_1 = __importDefault(require("lodash"));
+function enrichWithPreloadedRows(dbModel, dbTarget, conn, driver) {
+    var _a, _b, _c;
+    return __awaiter(this, void 0, void 0, function* () {
+        // const res = { ...dbTarget, tables: [...(dbTarget.tables || [])] };
+        const repl = {};
+        for (const tableTarget of dbTarget.tables) {
+            const tableModel = dbModel.tables.find(x => x.pairingId == tableTarget.pairingId);
+            if ((((_a = tableModel.preloadedRows) === null || _a === void 0 ? void 0 : _a.length) || 0) == 0)
+                continue;
+            const keyColumns = tableModel.preloadedRowsKey || ((_c = (_b = tableModel.primaryKey) === null || _b === void 0 ? void 0 : _b.columns) === null || _c === void 0 ? void 0 : _c.map(x => x.columnName));
+            if (((keyColumns === null || keyColumns === void 0 ? void 0 : keyColumns.length) || 0) == 0)
+                continue;
+            const dmp = driver.createDumper();
+            if (keyColumns.length == 1) {
+                dmp.putCmd('^select * ^from %f ^where %i ^in (%,v)', tableTarget, keyColumns[0], tableModel.preloadedRows.map(x => x[keyColumns[0]]));
+            }
+            else {
+                dmp.put('^select * ^from %f ^where', tableTarget);
+                dmp.putCollection(' ^or ', tableTarget.preloadedRows, row => {
+                    dmp.put('(');
+                    dmp.putCollection(' ^and ', keyColumns, col => dmp.put('%i=%v', col, row[col]));
+                    dmp.put(')');
+                });
+                dmp.endCommand();
+            }
+            const resp = yield driver.query(conn, dmp.s);
+            repl[tableTarget.pairingId] = Object.assign(Object.assign({}, tableTarget), { preloadedRows: resp.rows, preloadedRowsKey: keyColumns });
+        }
+        if (lodash_1.default.isEmpty(repl))
+            return dbTarget;
+        return Object.assign(Object.assign({}, dbTarget), { tables: dbTarget.tables.map(x => repl[x.pairingId] || x) });
+    });
+}
+exports.enrichWithPreloadedRows = enrichWithPreloadedRows;

package/lib/yamlModelConv.d.ts

@@ -16,6 +16,8 @@ export interface TableInfoYaml {
     name: string;
     columns: ColumnInfoYaml[];
     primaryKey?: string[];
+    insertKey?: string[];
+    data?: any[];
 }
 export interface ForeignKeyInfoYaml {
     deleteAction?: string;

package/lib/yamlModelConv.js

@@ -85,6 +85,8 @@ function tableInfoFromYaml(table, allTables) {
             columns: table.primaryKey.map(columnName => ({ columnName })),
         };
     }
+    res.preloadedRows = table.data;
+    res.preloadedRowsKey = table.insertKey;
     return res;
 }
 exports.tableInfoFromYaml = tableInfoFromYaml;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.4.0-alpha.2",
+  "version": "4.4.3",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -25,13 +25,14 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^4.4.0-alpha.2",
+    "dbgate-types": "^4.4.3",
     "jest": "^24.9.0",
     "ts-jest": "^25.2.1",
     "typescript": "^4.4.3"
   },
   "dependencies": {
     "lodash": "^4.17.21",
+    "dbgate-query-splitter": "^4.4.3",
     "uuid": "^3.4.0"
   }
 }