dbgate-tools 5.4.4 → 5.4.5-alpha.3

package/lib/SqlDumper.d.ts

@@ -31,6 +31,7 @@ export declare class SqlDumper implements AlterProcessor {
     columnDefault(column: ColumnInfo): void;
     putCollection<T>(delimiter: string, collection: T[], lambda: (col: T) => void): void;
     createTable(table: TableInfo): void;
+    tableOptions(table: TableInfo): void;
     createTablePrimaryKeyCore(table: TableInfo): void;
     createForeignKeyFore(fk: ForeignKeyInfo): void;
     transform(type: TransformType, dumpExpr: any): void;
@@ -111,5 +112,7 @@ export declare class SqlDumper implements AlterProcessor {
     createSqlObject(obj: SqlObjectInfo): void;
     getSqlObjectSqlName(ojectTypeField: string): "PROCEDURE" | "VIEW" | "FUNCTION" | "TRIGGER" | "MATERIALIZED VIEW";
     dropSqlObject(obj: SqlObjectInfo): void;
+    setTableOption(table: TableInfo, optionName: string, optionValue: string): void;
+    setTableOptionCore(table: TableInfo, optionName: string, optionValue: string, formatString: string): void;
     fillPreloadedRows(table: NamedObjectInfo, oldRows: any[], newRows: any[], key: string[], insertOnly: string[], autoIncrementColumn: string): void;
 }

package/lib/SqlDumper.js

@@ -215,7 +215,7 @@ class SqlDumper {
         }
     }
     columnDefinition(column, { includeDefault = true, includeNullable = true, includeCollate = true } = {}) {
-        var _a;
+        var _a, _b;
         if (column.computedExpression) {
             this.put('^as %s', column.computedExpression);
             if (column.isPersisted)
@@ -228,10 +228,10 @@ class SqlDumper {
         }
         this.putRaw(' ');
         this.specialColumnOptions(column);
-        if (includeNullable) {
+        if (includeNullable && !((_a = this.dialect) === null || _a === void 0 ? void 0 : _a.specificNullabilityImplementation)) {
             this.put(column.notNull ? '^not ^null' : '^null');
         }
-        if (includeDefault && ((_a = column.defaultValue) === null || _a === void 0 ? void 0 : _a.trim())) {
+        if (includeDefault && ((_b = column.defaultValue) === null || _b === void 0 ? void 0 : _b.trim())) {
             this.columnDefault(column);
         }
     }
@@ -274,11 +274,22 @@ class SqlDumper {
             this.createCheckCore(chk);
         });
         this.put('&<&n)');
+        this.tableOptions(table);
         this.endCommand();
         (table.indexes || []).forEach(ix => {
             this.createIndex(ix);
         });
     }
+    tableOptions(table) {
+        var _a, _b, _c;
+        const options = ((_c = (_b = (_a = this.driver) === null || _a === void 0 ? void 0 : _a.dialect) === null || _b === void 0 ? void 0 : _b.getTableFormOptions) === null || _c === void 0 ? void 0 : _c.call(_b, 'sqlCreateTable')) || [];
+        for (const option of options) {
+            if (table[option.name]) {
+                this.put('&n');
+                this.put(option.sqlFormatString, table[option.name]);
+            }
+        }
+    }
     createTablePrimaryKeyCore(table) {
         if (table.primaryKey) {
             this.put(',&n');
@@ -482,7 +493,10 @@ class SqlDumper {
     }
     renameConstraint(constraint, newName) { }
     createColumn(column, constraints) {
-        this.put('^alter ^table %f ^add %i ', column, column.columnName);
+        this.put('^alter ^table %f ^add ', column);
+        if (this.dialect.createColumnWithColumnKeyword)
+            this.put('^column ');
+        this.put(' %i ', column.columnName);
         this.columnDefinition(column);
         this.inlineConstraints(constraints);
         this.endCommand();
@@ -545,29 +559,36 @@ class SqlDumper {
             throw new Error('Recreate is not possible: oldTable.paringId != newTable.paringId');
         }
         const tmpTable = `temp_${(0, v1_1.default)()}`;
-        // console.log('oldTable', oldTable);
-        // console.log('newTable', newTable);
         const columnPairs = oldTable.columns
             .map(oldcol => ({
             oldcol,
             newcol: newTable.columns.find(x => x.pairingId == oldcol.pairingId),
         }))
             .filter(x => x.newcol);
-        this.dropConstraints(oldTable, true);
-        this.renameTable(oldTable, tmpTable);
-        this.createTable(newTable);
-        const autoinc = newTable.columns.find(x => x.autoIncrement);
-        if (autoinc) {
-            this.allowIdentityInsert(newTable, true);
-        }
-        this.putCmd('^insert ^into %f (%,i) select %,s ^from %f', newTable, columnPairs.map(x => x.newcol.columnName), columnPairs.map(x => x.oldcol.columnName), Object.assign(Object.assign({}, oldTable), { pureName: tmpTable }));
-        if (autoinc) {
-            this.allowIdentityInsert(newTable, false);
+        if (this.driver.supportsTransactions) {
+            this.dropConstraints(oldTable, true);
+            this.renameTable(oldTable, tmpTable);
+            this.createTable(newTable);
+            const autoinc = newTable.columns.find(x => x.autoIncrement);
+            if (autoinc) {
+                this.allowIdentityInsert(newTable, true);
+            }
+            this.putCmd('^insert ^into %f (%,i) select %,s ^from %f', newTable, columnPairs.map(x => x.newcol.columnName), columnPairs.map(x => x.oldcol.columnName), Object.assign(Object.assign({}, oldTable), { pureName: tmpTable }));
+            if (autoinc) {
+                this.allowIdentityInsert(newTable, false);
+            }
+            if (this.dialect.dropForeignKey) {
+                newTable.dependencies.forEach(cnt => this.createConstraint(cnt));
+            }
+            this.dropTable(Object.assign(Object.assign({}, oldTable), { pureName: tmpTable }));
         }
-        if (this.dialect.dropForeignKey) {
-            newTable.dependencies.forEach(cnt => this.createConstraint(cnt));
+        else {
+            // we have to preserve old table as long as possible
+            this.createTable(Object.assign(Object.assign({}, newTable), { pureName: tmpTable }));
+            this.putCmd('^insert ^into %f (%,i) select %,s ^from %f', Object.assign(Object.assign({}, newTable), { pureName: tmpTable }), columnPairs.map(x => x.newcol.columnName), columnPairs.map(x => x.oldcol.columnName), oldTable);
+            this.dropTable(oldTable);
+            this.renameTable(Object.assign(Object.assign({}, newTable), { pureName: tmpTable }), newTable.pureName);
         }
-        this.dropTable(Object.assign(Object.assign({}, oldTable), { pureName: tmpTable }));
     }
     createSqlObject(obj) {
         this.putCmd(obj.createSql);
@@ -589,6 +610,20 @@ class SqlDumper {
     dropSqlObject(obj) {
         this.putCmd('^drop %s %f', this.getSqlObjectSqlName(obj.objectTypeField), obj);
     }
+    setTableOption(table, optionName, optionValue) {
+        var _a, _b;
+        const options = (_b = (_a = this === null || this === void 0 ? void 0 : this.dialect) === null || _a === void 0 ? void 0 : _a.getTableFormOptions) === null || _b === void 0 ? void 0 : _b.call(_a, 'sqlAlterTable');
+        const option = options === null || options === void 0 ? void 0 : options.find(x => x.name == optionName && !x.disabled);
+        if (!option) {
+            return;
+        }
+        this.setTableOptionCore(table, optionName, optionValue, option.sqlFormatString);
+        this.endCommand();
+    }
+    setTableOptionCore(table, optionName, optionValue, formatString) {
+        this.put('^alter ^table %f ', table);
+        this.put(formatString, optionValue);
+    }
     fillPreloadedRows(table, oldRows, newRows, key, insertOnly, autoIncrementColumn) {
         let was = false;
         for (const row of newRows) {

package/lib/alterPlan.d.ts

@@ -71,7 +71,13 @@ interface AlterOperation_FillPreloadedRows {
     insertOnly: string[];
     autoIncrementColumn: 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;
+interface AlterOperation_SetTableOption {
+    operationType: 'setTableOption';
+    table: TableInfo;
+    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;
 export declare class AlterPlan {
     wholeOldDb: DatabaseInfo;
     wholeNewDb: DatabaseInfo;
@@ -99,6 +105,7 @@ export declare class AlterPlan {
     renameConstraint(constraint: ConstraintInfo, newName: string): void;
     recreateTable(table: TableInfo, operations: AlterOperation[]): void;
     fillPreloadedRows(table: NamedObjectInfo, oldRows: any[], newRows: any[], key: string[], insertOnly: string[], autoIncrementColumn: string): void;
+    setTableOption(table: TableInfo, optionName: string, optionValue: string): void;
     run(processor: AlterProcessor): void;
     _getDependendColumnConstraints(column: ColumnInfo, dependencyDefinition: any): import("dbgate-types/dbinfo").PrimaryKeyInfo[];
     _addLogicalDependencies(): AlterOperation[];

package/lib/alterPlan.js

@@ -123,6 +123,14 @@ class AlterPlan {
             autoIncrementColumn,
         });
     }
+    setTableOption(table, optionName, optionValue) {
+        this.operations.push({
+            operationType: 'setTableOption',
+            table,
+            optionName,
+            optionValue,
+        });
+    }
     run(processor) {
         for (const op of this.operations) {
             runAlterOperation(op, processor);
@@ -137,6 +145,7 @@ class AlterPlan {
             : [];
         const constraints = lodash_1.default.compact([
             (dependencyDefinition === null || dependencyDefinition === void 0 ? void 0 : dependencyDefinition.includes('primaryKey')) ? table.primaryKey : null,
+            (dependencyDefinition === null || dependencyDefinition === void 0 ? void 0 : dependencyDefinition.includes('sortingKey')) ? table.sortingKey : null,
             ...((dependencyDefinition === null || dependencyDefinition === void 0 ? void 0 : dependencyDefinition.includes('foreignKeys')) ? table.foreignKeys : []),
             ...((dependencyDefinition === null || dependencyDefinition === void 0 ? void 0 : dependencyDefinition.includes('indexes')) ? table.indexes : []),
             ...((dependencyDefinition === null || dependencyDefinition === void 0 ? void 0 : dependencyDefinition.includes('uniques')) ? table.uniques : []),
@@ -236,6 +245,8 @@ class AlterPlan {
     _canCreateConstraint(cnt) {
         if (cnt.constraintType == 'primaryKey')
             return this.dialect.createPrimaryKey;
+        if (cnt.constraintType == 'sortingKey')
+            return this.dialect.createPrimaryKey;
         if (cnt.constraintType == 'foreignKey')
             return this.dialect.createForeignKey;
         if (cnt.constraintType == 'index')
@@ -249,6 +260,8 @@ class AlterPlan {
     _canDropConstraint(cnt) {
         if (cnt.constraintType == 'primaryKey')
             return this.dialect.dropPrimaryKey;
+        if (cnt.constraintType == 'sortingKey')
+            return this.dialect.dropPrimaryKey;
         if (cnt.constraintType == 'foreignKey')
             return this.dialect.dropForeignKey;
         if (cnt.constraintType == 'index')
@@ -408,6 +421,9 @@ function runAlterOperation(op, processor) {
         case 'dropSqlObject':
             processor.dropSqlObject(op.oldObject);
             break;
+        case 'setTableOption':
+            processor.setTableOption(op.table, op.optionName, op.optionValue);
+            break;
         case 'fillPreloadedRows':
             processor.fillPreloadedRows(op.table, op.oldRows, op.newRows, op.key, op.insertOnly, op.autoIncrementColumn);
             break;

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

@@ -17,4 +17,5 @@ export declare class DatabaseInfoAlterProcessor {
     renameConstraint(constraint: ConstraintInfo, newName: string): void;
     recreateTable(oldTable: TableInfo, newTable: TableInfo): void;
     fillPreloadedRows(table: NamedObjectInfo, oldRows: any[], newRows: any[], key: string[], insertOnly: string[], autoIncrementColumn: string): void;
+    setTableOption(table: TableInfo, optionName: string, optionValue: string): void;
 }

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

@@ -45,6 +45,9 @@ class DatabaseInfoAlterProcessor {
             case 'primaryKey':
                 table.primaryKey = constraint;
                 break;
+            case 'sortingKey':
+                table.sortingKey = constraint;
+                break;
             case 'foreignKey':
                 table.foreignKeys.push(constraint);
                 break;
@@ -68,6 +71,9 @@ class DatabaseInfoAlterProcessor {
             case 'primaryKey':
                 table.primaryKey = null;
                 break;
+            case 'sortingKey':
+                table.sortingKey = null;
+                break;
             case 'foreignKey':
                 table.foreignKeys = table.foreignKeys.filter(x => x.constraintName != constraint.constraintName);
                 break;
@@ -99,5 +105,9 @@ class DatabaseInfoAlterProcessor {
         tableInfo.preloadedRowsKey = key;
         tableInfo.preloadedRowsInsertOnly = insertOnly;
     }
+    setTableOption(table, optionName, optionValue) {
+        const tableInfo = this.db.tables.find(x => x.pureName == table.pureName && x.schemaName == table.schemaName);
+        tableInfo[optionName] = optionValue;
+    }
 }
 exports.DatabaseInfoAlterProcessor = DatabaseInfoAlterProcessor;

package/lib/diffTools.js

@@ -16,7 +16,7 @@ function generateTablePairingId(table) {
     if (!table)
         return table;
     if (!table.pairingId) {
-        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: col.pairingId || (0, v1_1.default)() }))), foreignKeys: (_b = table.foreignKeys) === null || _b === void 0 ? void 0 : _b.map(cnt => (Object.assign(Object.assign({}, cnt), { pairingId: cnt.pairingId || (0, v1_1.default)() }))), checks: (_c = table.checks) === null || _c === void 0 ? void 0 : _c.map(cnt => (Object.assign(Object.assign({}, cnt), { pairingId: cnt.pairingId || (0, v1_1.default)() }))), indexes: (_d = table.indexes) === null || _d === void 0 ? void 0 : _d.map(cnt => (Object.assign(Object.assign({}, cnt), { pairingId: cnt.pairingId || (0, v1_1.default)() }))), uniques: (_e = table.uniques) === null || _e === void 0 ? void 0 : _e.map(cnt => (Object.assign(Object.assign({}, cnt), { pairingId: cnt.pairingId || (0, v1_1.default)() }))), pairingId: table.pairingId || (0, v1_1.default)() });
+        return Object.assign(Object.assign({}, table), { primaryKey: table.primaryKey && Object.assign(Object.assign({}, table.primaryKey), { pairingId: table.primaryKey.pairingId || (0, v1_1.default)() }), sortingKey: table.sortingKey && Object.assign(Object.assign({}, table.sortingKey), { pairingId: table.sortingKey.pairingId || (0, v1_1.default)() }), columns: (_a = table.columns) === null || _a === void 0 ? void 0 : _a.map(col => (Object.assign(Object.assign({}, col), { pairingId: col.pairingId || (0, v1_1.default)() }))), foreignKeys: (_b = table.foreignKeys) === null || _b === void 0 ? void 0 : _b.map(cnt => (Object.assign(Object.assign({}, cnt), { pairingId: cnt.pairingId || (0, v1_1.default)() }))), checks: (_c = table.checks) === null || _c === void 0 ? void 0 : _c.map(cnt => (Object.assign(Object.assign({}, cnt), { pairingId: cnt.pairingId || (0, v1_1.default)() }))), indexes: (_d = table.indexes) === null || _d === void 0 ? void 0 : _d.map(cnt => (Object.assign(Object.assign({}, cnt), { pairingId: cnt.pairingId || (0, v1_1.default)() }))), uniques: (_e = table.uniques) === null || _e === void 0 ? void 0 : _e.map(cnt => (Object.assign(Object.assign({}, cnt), { pairingId: cnt.pairingId || (0, v1_1.default)() }))), pairingId: table.pairingId || (0, v1_1.default)() });
     }
     return table;
 }
@@ -217,6 +217,8 @@ function getTableConstraints(table) {
     const res = [];
     if (table.primaryKey)
         res.push(table.primaryKey);
+    if (table.sortingKey)
+        res.push(table.sortingKey);
     if (table.foreignKeys)
         res.push(...table.foreignKeys);
     if (table.indexes)
@@ -230,7 +232,7 @@ function getTableConstraints(table) {
 function createPairs(oldList, newList, additionalCondition = null) {
     const res = [];
     for (const a of oldList) {
-        const b = newList.find(x => x.pairingId == a.pairingId || (additionalCondition && additionalCondition(a, x)));
+        const b = newList.find(x => (a.pairingId && x.pairingId == a.pairingId) || (additionalCondition && additionalCondition(a, x)));
         if (b) {
             res.push([a, b]);
         }
@@ -255,8 +257,12 @@ function planTablePreload(plan, oldTable, newTable) {
 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));
+    const constraintPairs = createPairs(getTableConstraints(oldTable), getTableConstraints(newTable), (a, b) => (a.constraintType == 'primaryKey' && b.constraintType == 'primaryKey') ||
+        (a.constraintType == 'sortingKey' && b.constraintType == 'sortingKey'));
+    // console.log('constraintPairs OLD TABLE', oldTable);
+    // console.log('constraintPairs NEW TABLE', newTable);
+    // console.log('constraintPairs SOURCE OLD', getTableConstraints(oldTable));
+    // console.log('constraintPairs SOURCE NEW', getTableConstraints(newTable));
     // console.log('constraintPairs', constraintPairs);
     if (!opts.noDropConstraint) {
         constraintPairs.filter(x => x[1] == null).forEach(x => plan.dropConstraint(x[0]));
@@ -277,7 +283,7 @@ function planAlterTable(plan, oldTable, newTable, opts) {
                 plan.renameColumn(x[0], x[1].columnName);
             }
             else {
-                // console.log('PLAN CHANGE COLUMN')
+                // console.log('PLAN CHANGE COLUMN', x[0], x[1]);
                 plan.changeColumn(x[0], x[1]);
             }
         }
@@ -292,6 +298,24 @@ 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);
+    // console.log('plan.operations', plan.operations);
+}
+function planChangeTableOptions(plan, oldTable, newTable, opts) {
+    var _a, _b;
+    for (const option of ((_b = (_a = plan.dialect) === null || _a === void 0 ? void 0 : _a.getTableFormOptions) === null || _b === void 0 ? void 0 : _b.call(_a, 'sqlAlterTable')) || []) {
+        if (option.disabled) {
+            continue;
+        }
+        const name = option.name;
+        if (oldTable[name] != newTable[name] &&
+            (oldTable[name] || newTable[name]) &&
+            (newTable[name] || option.allowEmptyValue)) {
+            plan.setTableOption(newTable, name, newTable[name]);
+        }
+    }
 }
 function testEqualTables(a, b, opts, wholeOldDb, wholeNewDb, driver) {
     const plan = new alterPlan_1.AlterPlan(wholeOldDb, wholeNewDb, driver.dialect, opts);

package/lib/driverBase.d.ts

@@ -46,4 +46,5 @@ export declare const driverBase: {
         parseSqlNull: boolean;
         parseHexAsBuffer: boolean;
     };
+    createSaveChangeSetScript(changeSet: any, dbinfo: any, defaultCreator: any): any;
 };

package/lib/driverBase.js

@@ -84,7 +84,7 @@ exports.driverBase = {
     },
     script(pool, sql, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (options === null || options === void 0 ? void 0 : options.useTransaction) {
+            if ((options === null || options === void 0 ? void 0 : options.useTransaction) && this.supportsTransactions) {
                 runCommandOnDriver(pool, this, dmp => dmp.beginTransaction());
             }
             for (const sqlItem of (0, dbgate_query_splitter_1.splitQuery)(sql, this.getQuerySplitterOptions('script'))) {
@@ -92,13 +92,13 @@ exports.driverBase = {
                     yield this.query(pool, sqlItem, { discardResult: true });
                 }
                 catch (err) {
-                    if (options === null || options === void 0 ? void 0 : options.useTransaction) {
+                    if ((options === null || options === void 0 ? void 0 : options.useTransaction) && this.supportsTransactions) {
                         runCommandOnDriver(pool, this, dmp => dmp.rollbackTransaction());
                     }
                     throw err;
                 }
             }
-            if (options === null || options === void 0 ? void 0 : options.useTransaction) {
+            if ((options === null || options === void 0 ? void 0 : options.useTransaction) && this.supportsTransactions) {
                 runCommandOnDriver(pool, this, dmp => dmp.commitTransaction());
             }
         });
@@ -191,4 +191,7 @@ exports.driverBase = {
         parseSqlNull: true,
         parseHexAsBuffer: true,
     },
+    createSaveChangeSetScript(changeSet, dbinfo, defaultCreator) {
+        return defaultCreator(changeSet, dbinfo);
+    },
 };

package/lib/schemaEditorTools.js

@@ -125,6 +125,9 @@ function editorAddConstraint(table, constraint) {
     if (constraint.constraintType == 'primaryKey') {
         res.primaryKey = Object.assign({ pairingId: (0, v1_1.default)() }, constraint);
     }
+    if (constraint.constraintType == 'sortingKey') {
+        res.sortingKey = Object.assign({ pairingId: (0, v1_1.default)() }, constraint);
+    }
     if (constraint.constraintType == 'foreignKey') {
         res.foreignKeys = [
             ...(res.foreignKeys || []),
@@ -151,6 +154,9 @@ function editorModifyConstraint(table, constraint) {
     if (constraint.constraintType == 'primaryKey') {
         res.primaryKey = Object.assign(Object.assign({}, res.primaryKey), constraint);
     }
+    if (constraint.constraintType == 'sortingKey') {
+        res.sortingKey = Object.assign(Object.assign({}, res.sortingKey), constraint);
+    }
     if (constraint.constraintType == 'foreignKey') {
         res.foreignKeys = table.foreignKeys.map(fk => fk.pairingId == constraint.pairingId ? Object.assign(Object.assign({}, fk), constraint) : fk);
     }
@@ -168,6 +174,9 @@ function editorDeleteConstraint(table, constraint) {
     if (constraint.constraintType == 'primaryKey') {
         res.primaryKey = null;
     }
+    if (constraint.constraintType == 'sortingKey') {
+        res.sortingKey = null;
+    }
     if (constraint.constraintType == 'foreignKey') {
         res.foreignKeys = table.foreignKeys.filter(x => x.pairingId != constraint.pairingId);
     }

package/lib/structureTools.js

@@ -15,7 +15,8 @@ function addTableDependencies(db) {
 exports.addTableDependencies = addTableDependencies;
 function extendTableInfo(table) {
     return Object.assign(Object.assign({}, table), { objectTypeField: 'tables', columns: (table.columns || []).map(column => (Object.assign({ pureName: table.pureName, schemaName: table.schemaName }, column))), primaryKey: table.primaryKey
-            ? Object.assign(Object.assign({}, table.primaryKey), { pureName: table.pureName, schemaName: table.schemaName, constraintType: 'primaryKey' }) : undefined, foreignKeys: (table.foreignKeys || []).map(cnt => (Object.assign(Object.assign({}, cnt), { pureName: table.pureName, schemaName: table.schemaName, constraintType: 'foreignKey' }))), indexes: (table.indexes || []).map(cnt => (Object.assign(Object.assign({}, cnt), { pureName: table.pureName, schemaName: table.schemaName, constraintType: 'index' }))), checks: (table.checks || []).map(cnt => (Object.assign(Object.assign({}, cnt), { pureName: table.pureName, schemaName: table.schemaName, constraintType: 'check' }))), uniques: (table.uniques || []).map(cnt => (Object.assign(Object.assign({}, cnt), { pureName: table.pureName, schemaName: table.schemaName, constraintType: 'unique' }))) });
+            ? Object.assign(Object.assign({}, table.primaryKey), { pureName: table.pureName, schemaName: table.schemaName, constraintType: 'primaryKey' }) : undefined, sortingKey: table.sortingKey
+            ? Object.assign(Object.assign({}, table.sortingKey), { pureName: table.pureName, schemaName: table.schemaName, constraintType: 'sortingKey' }) : undefined, foreignKeys: (table.foreignKeys || []).map(cnt => (Object.assign(Object.assign({}, cnt), { pureName: table.pureName, schemaName: table.schemaName, constraintType: 'foreignKey' }))), indexes: (table.indexes || []).map(cnt => (Object.assign(Object.assign({}, cnt), { pureName: table.pureName, schemaName: table.schemaName, constraintType: 'index' }))), checks: (table.checks || []).map(cnt => (Object.assign(Object.assign({}, cnt), { pureName: table.pureName, schemaName: table.schemaName, constraintType: 'check' }))), uniques: (table.uniques || []).map(cnt => (Object.assign(Object.assign({}, cnt), { pureName: table.pureName, schemaName: table.schemaName, constraintType: 'unique' }))) });
 }
 exports.extendTableInfo = extendTableInfo;
 function fillDatabaseExtendedInfo(db) {

package/lib/tableTransforms.js

@@ -15,6 +15,7 @@ function prepareTableForImport(table) {
     res.checks = [];
     if (res.primaryKey)
         res.primaryKey.constraintName = null;
+    res.tableEngine = null;
     return res;
 }
 exports.prepareTableForImport = prepareTableForImport;

package/lib/yamlModelConv.d.ts

@@ -20,6 +20,7 @@ export interface TableInfoYaml {
     name: string;
     columns: ColumnInfoYaml[];
     primaryKey?: string[];
+    sortingKey?: string[];
     insertKey?: string[];
     insertOnly?: string[];
     data?: any[];

package/lib/yamlModelConv.js

@@ -54,6 +54,9 @@ function tableInfoToYaml(table) {
     if (tableCopy.primaryKey && !tableCopy.primaryKey['_dumped']) {
         res.primaryKey = tableCopy.primaryKey.columns.map(x => x.columnName);
     }
+    if (tableCopy.sortingKey && !tableCopy.sortingKey['_dumped']) {
+        res.sortingKey = tableCopy.sortingKey.columns.map(x => x.columnName);
+    }
     // const foreignKeys = (tableCopy.foreignKeys || []).filter(x => !x['_dumped']).map(foreignKeyInfoToYaml);
     return res;
 }
@@ -89,6 +92,13 @@ function tableInfoFromYaml(table, allTables) {
             columns: table.primaryKey.map(columnName => ({ columnName })),
         };
     }
+    if (table.sortingKey) {
+        res.sortingKey = {
+            pureName: table.name,
+            constraintType: 'sortingKey',
+            columns: table.sortingKey.map(columnName => ({ columnName })),
+        };
+    }
     res.preloadedRows = table.data;
     res.preloadedRowsKey = table.insertKey;
     res.preloadedRowsInsertOnly = table.insertOnly;

package/package.json

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