dbgate-tools 5.5.6 → 5.5.7-alpha.16

package/lib/SqlDumper.d.ts

@@ -102,6 +102,7 @@ export declare class SqlDumper implements AlterProcessor {
     }): void;
     changeTableSchema(obj: TableInfo, schema: string): void;
     renameTable(obj: TableInfo, newname: string): void;
+    renameSqlObject(obj: SqlObjectInfo, newname: string): void;
     beginTransaction(): void;
     commitTransaction(): void;
     rollbackTransaction(): void;

package/lib/SqlDumper.js

@@ -299,7 +299,7 @@ class SqlDumper {
     createTablePrimaryKeyCore(table) {
         if (table.primaryKey) {
             this.put(',&n');
-            if (table.primaryKey.constraintName) {
+            if (table.primaryKey.constraintName && !this.dialect.anonymousPrimaryKey) {
                 this.put('^constraint %i', table.primaryKey.constraintName);
             }
             this.put(' ^primary ^key (%,i)', table.primaryKey.columns.map(x => x.columnName));
@@ -529,6 +529,7 @@ class SqlDumper {
     }
     changeTableSchema(obj, schema) { }
     renameTable(obj, newname) { }
+    renameSqlObject(obj, newname) { }
     beginTransaction() {
         this.putCmd('^begin ^transaction');
     }
@@ -597,7 +598,8 @@ class SqlDumper {
         }
     }
     createSqlObject(obj) {
-        this.putCmd(obj.createSql);
+        this.putRaw(obj.createSql);
+        this.endCommand();
     }
     getSqlObjectSqlName(ojectTypeField) {
         switch (ojectTypeField) {

package/lib/alterPlan.d.ts

@@ -21,6 +21,11 @@ interface AlterOperation_RenameTable {
     object: TableInfo;
     newName: string;
 }
+interface AlterOperation_RenameSqlObject {
+    operationType: 'renameSqlObject';
+    object: SqlObjectInfo;
+    newName: string;
+}
 interface AlterOperation_CreateColumn {
     operationType: 'createColumn';
     newObject: ColumnInfo;
@@ -77,7 +82,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;
+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;
@@ -101,6 +106,7 @@ export declare class AlterPlan {
     changeConstraint(oldConstraint: ConstraintInfo, newConstraint: ConstraintInfo): void;
     dropConstraint(constraint: ConstraintInfo): void;
     renameTable(table: TableInfo, newName: string): void;
+    renameSqlObject(table: TableInfo, newName: string): void;
     renameColumn(column: ColumnInfo, newName: string): void;
     renameConstraint(constraint: ConstraintInfo, newName: string): void;
     recreateTable(table: TableInfo, operations: AlterOperation[]): void;

package/lib/alterPlan.js

@@ -90,6 +90,13 @@ class AlterPlan {
             newName,
         });
     }
+    renameSqlObject(table, newName) {
+        this.operations.push({
+            operationType: 'renameSqlObject',
+            object: table,
+            newName,
+        });
+    }
     renameColumn(column, newName) {
         this.operations.push({
             operationType: 'renameColumn',
@@ -290,7 +297,7 @@ class AlterPlan {
             }
             // console.log('*****************RECREATED NEEDED', op, operationType, isAllowed);
             // console.log(this.dialect);
-            if (this.opts.noDropTable) {
+            if (this.opts.noDropTable && !this.opts.allowTableRecreateWhenNoDrop) {
                 // skip this operation, as it cannot be achieved
                 return [];
             }
@@ -341,7 +348,9 @@ class AlterPlan {
             return this.operations;
         }
         const fks = [];
-        const res = this.operations.map(op => {
+        const res = this.operations
+            .filter(op => op.operationType != 'createConstraint')
+            .map(op => {
             if (op.operationType == 'createTable') {
                 fks.push(...(op.newObject.foreignKeys || []));
                 return Object.assign(Object.assign({}, op), { newObject: Object.assign(Object.assign({}, op.newObject), { foreignKeys: [] }) });
@@ -350,6 +359,7 @@ class AlterPlan {
         });
         return [
             ...res,
+            ...this.operations.filter(op => op.operationType == 'createConstraint'),
             ...fks.map(fk => ({
                 operationType: 'createConstraint',
                 newObject: fk,
@@ -366,8 +376,13 @@ class AlterPlan {
                 return false;
             if (this.opts.noDropConstraint && op.operationType == 'dropConstraint')
                 return false;
-            if (this.opts.noDropSqlObject && op.operationType == 'dropSqlObject')
-                return false;
+            // if (
+            //   this.opts.noDropSqlObject &&
+            //   op.operationType == 'dropSqlObject' &&
+            //   // allow to drop previously deleted SQL objects
+            //   !hasDeletedPrefix(op.oldObject.pureName, this.opts, this.opts.deletedSqlObjectPrefix)
+            // )
+            //   return false;
             return true;
         });
     }
@@ -418,6 +433,9 @@ function runAlterOperation(op, processor) {
         case 'renameTable':
             processor.renameTable(op.object, op.newName);
             break;
+        case 'renameSqlObject':
+            processor.renameSqlObject(op.object, op.newName);
+            break;
         case 'renameConstraint':
             processor.renameConstraint(op.object, op.newName);
             break;

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

@@ -13,6 +13,7 @@ export declare class DatabaseInfoAlterProcessor {
     changeConstraint(oldConstraint: ConstraintInfo, newConstraint: ConstraintInfo): void;
     dropConstraint(constraint: ConstraintInfo): void;
     renameTable(table: TableInfo, newName: string): void;
+    renameSqlObject(obj: SqlObjectInfo, newName: string): void;
     renameColumn(column: ColumnInfo, newName: string): void;
     renameConstraint(constraint: ConstraintInfo, newName: string): void;
     recreateTable(oldTable: TableInfo, newTable: TableInfo): void;

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

@@ -91,6 +91,10 @@ class DatabaseInfoAlterProcessor {
     renameTable(table, newName) {
         this.db.tables.find(x => x.pureName == table.pureName && x.schemaName == table.schemaName).pureName = newName;
     }
+    renameSqlObject(obj, newName) {
+        this.db[obj.objectTypeField].find(x => x.pureName == obj.pureName && x.schemaName == obj.schemaName).pureName =
+            newName;
+    }
     renameColumn(column, newName) {
         const table = this.db.tables.find(x => x.pureName == column.pureName && x.schemaName == column.schemaName);
         table.columns.find(x => x.columnName == column.columnName).columnName = newName;

package/lib/diffTools.d.ts

@@ -8,9 +8,13 @@ export interface DbDiffOptions {
     rightImplicitSchema?: string;
     ignoreConstraintNames?: boolean;
     noDropTable?: boolean;
+    allowTableRecreateWhenNoDrop?: boolean;
+    deletedTablePrefix?: string;
     noDropColumn?: boolean;
+    deletedColumnPrefix?: string;
     noDropConstraint?: boolean;
     noDropSqlObject?: boolean;
+    deletedSqlObjectPrefix?: string;
     noRenameTable?: boolean;
     noRenameColumn?: boolean;
     ignoreForeignKeyActions?: boolean;
@@ -19,6 +23,7 @@ export interface DbDiffOptions {
 export declare function generateTablePairingId(table: TableInfo): TableInfo;
 export declare function removeTablePairingId(table: TableInfo): TableInfo;
 export declare function generateDbPairingId(db: DatabaseInfo): DatabaseInfo;
+export declare function hasDeletedPrefix(name: string, opts: DbDiffOptions, deletedPrefix?: string): boolean;
 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, wholeOldDb: DatabaseInfo, wholeNewDb: DatabaseInfo, driver: EngineDriver): boolean;

package/lib/diffTools.js

@@ -3,14 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 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.generateDbPairingId = exports.removeTablePairingId = 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.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"));
 function generateTablePairingId(table) {
     var _a, _b, _c, _d, _e;
     if (!table)
@@ -42,7 +45,36 @@ function generateDbPairingId(db) {
         tables: (_a = db.tables) === null || _a === void 0 ? void 0 : _a.map(generateTablePairingId), views: (_b = db.views) === null || _b === void 0 ? void 0 : _b.map(generateObjectPairingId), procedures: (_c = db.procedures) === null || _c === void 0 ? void 0 : _c.map(generateObjectPairingId), functions: (_d = db.functions) === null || _d === void 0 ? void 0 : _d.map(generateObjectPairingId), triggers: (_e = db.triggers) === null || _e === void 0 ? void 0 : _e.map(generateObjectPairingId), matviews: (_f = db.matviews) === null || _f === void 0 ? void 0 : _f.map(generateObjectPairingId) });
 }
 exports.generateDbPairingId = generateDbPairingId;
-function testEqualNames(a, b, opts) {
+function getNameWithoutDeletedPrefix(name, opts, deletedPrefix) {
+    if (deletedPrefix) {
+        if (opts.ignoreCase) {
+            if ((name || '').toLowerCase().startsWith(deletedPrefix.toLowerCase())) {
+                return name.slice(deletedPrefix.length);
+            }
+        }
+        else {
+            if ((name || '').startsWith(deletedPrefix)) {
+                return name.slice(deletedPrefix.length);
+            }
+        }
+    }
+    return name;
+}
+function hasDeletedPrefix(name, opts, deletedPrefix) {
+    if (deletedPrefix) {
+        if (opts.ignoreCase) {
+            return (name || '').toLowerCase().startsWith(deletedPrefix.toLowerCase());
+        }
+        else {
+            return (name || '').startsWith(deletedPrefix);
+        }
+    }
+    return false;
+}
+exports.hasDeletedPrefix = hasDeletedPrefix;
+function testEqualNames(a, b, opts, deletedPrefix) {
+    a = getNameWithoutDeletedPrefix(a, opts, deletedPrefix);
+    b = getNameWithoutDeletedPrefix(b, opts, deletedPrefix);
     if (opts.ignoreCase)
         return (a || '').toLowerCase() == (b || '').toLowerCase();
     return a == b;
@@ -58,16 +90,25 @@ function testEqualSchemas(lschema, rschema, opts) {
         rschema = null;
     return testEqualNames(lschema, rschema, opts);
 }
-function testEqualFullNames(lft, rgt, opts) {
+function testEqualFullNames(lft, rgt, opts, deletedPrefix) {
     if (lft == null || rgt == null)
         return lft == rgt;
-    return testEqualSchemas(lft.schemaName, rgt.schemaName, opts) && testEqualNames(lft.pureName, rgt.pureName, opts);
+    return (testEqualSchemas(lft.schemaName, rgt.schemaName, opts) &&
+        testEqualNames(lft.pureName, rgt.pureName, opts, deletedPrefix));
 }
 function testEqualDefaultValues(value1, value2) {
     if (value1 == null)
         return value2 == null || value2 == 'NULL';
     if (value2 == null)
         return value1 == null || value1 == 'NULL';
+    if ((0, isString_1.default)(value1) && (0, isString_1.default)(value2)) {
+        value1 = value1.trim();
+        value2 = value2.trim();
+        if (value1.startsWith("'") && value1.endsWith("'") && value2.startsWith("'") && value2.endsWith("'")) {
+            return value1 == value2;
+        }
+        return value1.toLowerCase() == value2.toLowerCase();
+    }
     return value1 == value2;
 }
 function testEqualColumns(a, b, checkName, checkDefault, opts = {}) {
@@ -267,24 +308,43 @@ function planAlterTable(plan, oldTable, newTable, opts) {
     if (!opts.noDropConstraint) {
         constraintPairs.filter(x => x[1] == null).forEach(x => plan.dropConstraint(x[0]));
     }
-    if (!opts.noDropColumn) {
+    if (opts.deletedColumnPrefix) {
+        columnPairs
+            .filter(x => x[1] == null)
+            .forEach(x => {
+            if (!hasDeletedPrefix(x[0].columnName, opts, opts.deletedColumnPrefix)) {
+                plan.renameColumn(x[0], opts.deletedColumnPrefix + x[0].columnName);
+            }
+        });
+    }
+    else if (!opts.noDropColumn) {
         columnPairs.filter(x => x[1] == null).forEach(x => plan.dropColumn(x[0]));
     }
     if (!testEqualFullNames(oldTable, newTable, opts) && !opts.noRenameTable) {
         plan.renameTable(oldTable, newTable.pureName);
     }
+    if (hasDeletedPrefix(oldTable.pureName, opts, opts.deletedTablePrefix)) {
+        plan.renameTable(oldTable, newTable.pureName);
+    }
     columnPairs.filter(x => x[0] == null).forEach(x => plan.createColumn(x[1]));
     columnPairs
         .filter(x => x[0] && x[1])
         .forEach(x => {
-        if (!testEqualColumns(x[0], x[1], true, true, opts)) {
-            if (testEqualColumns(x[0], x[1], false, true, opts) && !opts.noRenameColumn) {
+        let srccol = x[0];
+        let dstcol = x[1];
+        if (hasDeletedPrefix(srccol.columnName, opts, opts.deletedColumnPrefix)) {
+            plan.renameColumn(srccol, dstcol.columnName);
+            // rename is already done
+            srccol = Object.assign(Object.assign({}, srccol), { columnName: dstcol.columnName });
+        }
+        if (!testEqualColumns(srccol, dstcol, true, true, opts)) {
+            if (testEqualColumns(srccol, dstcol, false, true, opts) && !opts.noRenameColumn) {
                 // console.log('PLAN RENAME COLUMN')
-                plan.renameColumn(x[0], x[1].columnName);
+                plan.renameColumn(srccol, dstcol.columnName);
             }
             else {
                 // console.log('PLAN CHANGE COLUMN', x[0], x[1]);
-                plan.changeColumn(x[0], x[1]);
+                plan.changeColumn(srccol, dstcol);
             }
         }
     });
@@ -325,7 +385,8 @@ function testEqualTables(a, b, opts, wholeOldDb, wholeNewDb, driver) {
 }
 exports.testEqualTables = testEqualTables;
 function testEqualSqlObjects(a, b, opts) {
-    return a.createSql == b.createSql;
+    var _a, _b;
+    return ((_a = a.createSql) === null || _a === void 0 ? void 0 : _a.trim()) == ((_b = b.createSql) === null || _b === void 0 ? void 0 : _b.trim());
 }
 exports.testEqualSqlObjects = testEqualSqlObjects;
 function createAlterTablePlan(oldTable, newTable, opts, wholeOldDb, wholeNewDb, driver) {
@@ -344,6 +405,36 @@ function createAlterTablePlan(oldTable, newTable, opts, wholeOldDb, wholeNewDb,
     return plan;
 }
 exports.createAlterTablePlan = createAlterTablePlan;
+function sortViewsByDependency(views) {
+    const viewNames = [];
+    const viewDict = {};
+    for (const view of views) {
+        if (!viewNames.includes(view.pureName)) {
+            viewNames.push(view.pureName);
+        }
+        viewDict[view.pureName] = viewDict[view.pureName]
+            ? `${viewDict[view.pureName]} ${view.createSql}}`
+            : view.createSql;
+    }
+    const edges = [];
+    for (const viewName of viewNames) {
+        edges.push([viewName, null]);
+        const viewText = viewDict[viewName];
+        for (const otherView of viewNames) {
+            if (otherView === viewName)
+                continue;
+            if ((' ' + viewText + ' ').match('[\\W]' + otherView + '[\\W]')) {
+                edges.push([otherView, viewName]);
+            }
+        }
+    }
+    const ordered = (0, compact_1.default)((0, toposort_1.default)(edges));
+    const res = [];
+    for (const viewName of ordered) {
+        res.push(...views.filter(x => x.pureName == viewName));
+    }
+    return res;
+}
 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']) {
@@ -351,7 +442,10 @@ function createAlterDatabasePlan(oldDb, newDb, opts, wholeOldDb, wholeNewDb, dri
             const newobj = (newDb[objectTypeField] || []).find(x => x.pairingId == oldobj.pairingId);
             if (objectTypeField == 'tables') {
                 if (newobj == null) {
-                    if (!opts.noDropTable) {
+                    if (opts.deletedTablePrefix && !hasDeletedPrefix(oldobj.pureName, opts, opts.deletedTablePrefix)) {
+                        plan.renameTable(oldobj, opts.deletedTablePrefix + oldobj.pureName);
+                    }
+                    else if (!opts.noDropTable) {
                         plan.dropTable(oldobj);
                     }
                 }
@@ -361,20 +455,33 @@ function createAlterDatabasePlan(oldDb, newDb, opts, wholeOldDb, wholeNewDb, dri
             }
             else {
                 if (newobj == null) {
-                    if (!opts.noDropSqlObject) {
+                    if (opts.deletedSqlObjectPrefix &&
+                        driver.dialect.renameSqlObject &&
+                        !hasDeletedPrefix(oldobj.pureName, opts, opts.deletedSqlObjectPrefix)) {
+                        plan.renameSqlObject(oldobj, opts.deletedSqlObjectPrefix + oldobj.pureName);
+                    }
+                    else if (!opts.noDropSqlObject) {
                         plan.dropSqlObject(oldobj);
                     }
                 }
-                else if (!testEqualSqlObjects(oldobj.createSql, newobj.createSql, opts)) {
-                    plan.recreates.sqlObjects += 1;
-                    if (!opts.noDropSqlObject) {
+                else {
+                    if (opts.deletedSqlObjectPrefix && hasDeletedPrefix(oldobj.pureName, opts, opts.deletedSqlObjectPrefix)) {
                         plan.dropSqlObject(oldobj);
+                        plan.createSqlObject(newobj);
+                    }
+                    else if (!testEqualSqlObjects(oldobj, newobj, opts)) {
+                        plan.recreates.sqlObjects += 1;
+                        plan.dropSqlObject(oldobj);
+                        plan.createSqlObject(newobj);
                     }
-                    plan.createSqlObject(newobj);
                 }
             }
         }
-        for (const newobj of newDb[objectTypeField] || []) {
+        let newList = newDb[objectTypeField] || [];
+        if (objectTypeField == 'views') {
+            newList = sortViewsByDependency(newList);
+        }
+        for (const newobj of newList) {
             const oldobj = (oldDb[objectTypeField] || []).find(x => x.pairingId == newobj.pairingId);
             if (objectTypeField == 'tables') {
                 if (oldobj == null) {
@@ -422,12 +529,12 @@ function matchPairedObjects(db1, db2, opts) {
     const res = (0, cloneDeep_1.default)(db2);
     for (const objectTypeField of ['tables', 'views', 'procedures', 'matviews', 'functions']) {
         for (const obj2 of res[objectTypeField] || []) {
-            const obj1 = db1[objectTypeField].find(x => testEqualFullNames(x, obj2, opts));
+            const obj1 = db1[objectTypeField].find(x => testEqualFullNames(x, obj2, opts, objectTypeField == 'tables' ? opts.deletedTablePrefix : opts.deletedSqlObjectPrefix));
             if (obj1) {
                 obj2.pairingId = obj1.pairingId;
                 if (objectTypeField == 'tables') {
                     for (const col2 of obj2.columns) {
-                        const col1 = obj1.columns.find(x => testEqualNames(x.columnName, col2.columnName, opts));
+                        const col1 = obj1.columns.find(x => testEqualNames(x.columnName, col2.columnName, opts, opts.deletedColumnPrefix));
                         if (col1)
                             col2.pairingId = col1.pairingId;
                     }

package/lib/driverBase.js

@@ -18,6 +18,9 @@ const SqlDumper_1 = require("./SqlDumper");
 const dbgate_query_splitter_1 = require("dbgate-query-splitter");
 const dbgate_sqltree_1 = require("dbgate-sqltree");
 const detectSqlFilterBehaviour_1 = require("./detectSqlFilterBehaviour");
+const getLogger_1 = require("./getLogger");
+const stringTools_1 = require("./stringTools");
+const logger = (0, getLogger_1.getLogger)('driverBase');
 const dialect = {
     limitSelect: true,
     rangeSelect: true,
@@ -89,6 +92,9 @@ 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`);
+                    }
                     yield this.query(pool, sqlItem, Object.assign({ discardResult: true }, options === null || options === void 0 ? void 0 : options.queryOptions));
                 }
                 catch (err) {

package/lib/getConnectionLabel.js

@@ -26,6 +26,9 @@ function getConnectionLabelCore(connection, { allowExplicitDatabase = true } = {
     if (connection.databaseFile) {
         return getDatabaseFileLabel(connection.databaseFile);
     }
+    if (connection.useSshTunnel && connection.server == 'localhost') {
+        return `${connection.sshHost} - SSH`;
+    }
     if (connection.server) {
         return connection.server;
     }

package/lib/stringTools.d.ts

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

package/lib/stringTools.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.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.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"));
@@ -489,3 +489,13 @@ function safeFormatDate(date) {
     }
 }
 exports.safeFormatDate = safeFormatDate;
+function getLimitedQuery(sql) {
+    if (!sql) {
+        return sql;
+    }
+    if (sql.length > 1000) {
+        return sql.substring(0, 1000) + '...';
+    }
+    return sql;
+}
+exports.getLimitedQuery = getLimitedQuery;

package/lib/yamlModelConv.js

@@ -37,10 +37,11 @@ function columnInfoFromYaml(column, table) {
     const res = {
         pureName: table.name,
         columnName: column.name,
-        dataType: column.length ? `${column.type}(${column.length})` : column.type,
+        dataType: column.length ? `${column.type}(${column.length < 0 ? 'max' : column.length})` : column.type,
         autoIncrement: column.autoIncrement,
         notNull: column.notNull || (table.primaryKey && table.primaryKey.includes(column.name)),
         defaultValue: column.default,
+        defaultConstraint: column.default != null ? `DF_${table.name}_${column.name}` : undefined,
     };
     return res;
 }
@@ -67,6 +68,7 @@ function convertForeignKeyFromYaml(col, table, allTables) {
         return null;
     return {
         constraintType: 'foreignKey',
+        constraintName: `FK_${table.name}_${col.name}`,
         pureName: table.name,
         refTableName: col.references,
         deleteAction: col.refDeleteAction,
@@ -89,6 +91,7 @@ function tableInfoFromYaml(table, allTables) {
         res.primaryKey = {
             pureName: table.name,
             constraintType: 'primaryKey',
+            constraintName: `PK_${table.name}`,
             columns: table.primaryKey.map(columnName => ({ columnName })),
         };
     }
@@ -96,6 +99,7 @@ function tableInfoFromYaml(table, allTables) {
         res.sortingKey = {
             pureName: table.name,
             constraintType: 'sortingKey',
+            constraintName: `SK_${table.name}`,
             columns: table.sortingKey.map(columnName => ({ columnName })),
         };
     }

package/package.json

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