dbgate-tools 5.5.7-alpha.53 → 5.5.7-alpha.68

package/lib/SqlDumper.d.ts

@@ -117,5 +117,6 @@ export declare class SqlDumper implements AlterProcessor {
     dropSqlObject(obj: SqlObjectInfo): void;
     setTableOption(table: TableInfo, optionName: string, optionValue: string): void;
     setTableOptionCore(table: TableInfo, optionName: string, optionValue: string, formatString: string): void;
+    fillNewNotNullDefaults(col: ColumnInfo): void;
     fillPreloadedRows(table: NamedObjectInfo, oldRows: any[], newRows: any[], key: string[], insertOnly: string[], autoIncrementColumn: string): void;
 }

package/lib/SqlDumper.js

@@ -242,7 +242,8 @@ class SqlDumper {
         }
     }
     columnDefault(column) {
-        if (column.defaultConstraint != null) {
+        var _a;
+        if (column.defaultConstraint != null && ((_a = this.dialect) === null || _a === void 0 ? void 0 : _a.namedDefaultConstraint)) {
             this.put(' ^constraint %i ^default %s ', column.defaultConstraint, column.defaultValue);
         }
         else {
@@ -583,7 +584,7 @@ class SqlDumper {
             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 }));
+            this.putCmd('^insert ^into %f (%,i) select %,i ^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);
             }
@@ -635,6 +636,11 @@ class SqlDumper {
         this.put('^alter ^table %f ', table);
         this.put(formatString, optionValue);
     }
+    fillNewNotNullDefaults(col) {
+        if (col.notNull && col.defaultValue != null) {
+            this.putCmd('^update %f ^set %i = %s ^where %i ^is ^null', col, col.columnName, col.defaultValue, col.columnName);
+        }
+    }
     fillPreloadedRows(table, oldRows, newRows, key, insertOnly, autoIncrementColumn) {
         let was = false;
         for (const row of newRows) {

package/lib/alterPlan.js

@@ -253,6 +253,12 @@ class AlterPlan {
                 this._testTableRecreate(op, 'createConstraint', obj => this._canCreateConstraint(obj), 'newObject') ||
                 this._testTableRecreate(op, 'dropConstraint', obj => this._canDropConstraint(obj), 'oldObject') ||
                 this._testTableRecreate(op, 'changeColumn', this.dialect.changeColumn, 'newObject') ||
+                // this._testTableRecreate(
+                //   op,
+                //   'changeColumn',
+                //   obj => this._canChangeAutoIncrement(obj, op as AlterOperation_ChangeColumn),
+                //   'newObject'
+                // ) ||
                 this._testTableRecreate(op, 'renameColumn', true, 'object') || [op]);
         });
         return lodash_1.default.flatten(lists);
@@ -287,6 +293,12 @@ class AlterPlan {
             return this.dialect.dropCheck;
         return null;
     }
+    // _canChangeAutoIncrement(column: ColumnInfo, op: AlterOperation_ChangeColumn) {
+    //   if (!!column.autoIncrement != !!op.oldObject.autoIncrement) {
+    //     return this.dialect.changeAutoIncrement;
+    //   }
+    //   return null;
+    // }
     _testTableRecreate(op, operationType, isAllowed, objectField) {
         if (op.operationType == operationType) {
             if (lodash_1.default.isFunction(isAllowed)) {
@@ -299,7 +311,7 @@ class AlterPlan {
             }
             // console.log('*****************RECREATED NEEDED', op, operationType, isAllowed);
             // console.log(this.dialect);
-            if (this.opts.noDropTable && !this.opts.allowTableRecreateWhenNoDrop) {
+            if (this.opts.noDropTable && !this.opts.allowTableRecreate) {
                 // skip this operation, as it cannot be achieved
                 return [];
             }

package/lib/computeDiffRows.js

@@ -92,8 +92,8 @@ 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 }));
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        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, sourceAutoIncrement: (_e = row === null || row === void 0 ? void 0 : row.source) === null || _e === void 0 ? void 0 : _e.autoIncrement, targetAutoIncrement: (_f = row === null || row === void 0 ? void 0 : row.target) === null || _f === void 0 ? void 0 : _f.autoIncrement, sourceNotNull: (_g = row === null || row === void 0 ? void 0 : row.source) === null || _g === void 0 ? void 0 : _g.notNull, targetNotNull: (_h = row === null || row === void 0 ? void 0 : row.target) === null || _h === void 0 ? void 0 : _h.notNull }));
     });
 }
 exports.computeTableDiffColumns = computeTableDiffColumns;

package/lib/diffTools.d.ts

@@ -8,7 +8,7 @@ export interface DbDiffOptions {
     rightImplicitSchema?: string;
     ignoreConstraintNames?: boolean;
     noDropTable?: boolean;
-    allowTableRecreateWhenNoDrop?: boolean;
+    allowTableRecreate?: boolean;
     deletedTablePrefix?: string;
     noDropColumn?: boolean;
     deletedColumnPrefix?: string;

package/lib/diffTools.js

@@ -549,14 +549,22 @@ function createAlterDatabasePlan(oldDb, newDb, opts, wholeOldDb, wholeNewDb, dri
                 }
                 else {
                     if (opts.deletedSqlObjectPrefix && hasDeletedPrefix(oldobj.pureName, opts, opts.deletedSqlObjectPrefix)) {
-                        plan.dropSqlObject(oldobj);
-                        plan.createSqlObject(newobj);
+                        if (driver.dialect.renameSqlObject && testEqualSqlObjects(oldobj, newobj, opts)) {
+                            plan.renameSqlObject(oldobj, newobj.pureName);
+                        }
+                        else {
+                            plan.dropSqlObject(oldobj);
+                            plan.createSqlObject(newobj);
+                        }
                     }
                     else if (!testEqualSqlObjects(oldobj, newobj, opts)) {
                         plan.recreates.sqlObjects += 1;
                         plan.dropSqlObject(oldobj);
                         plan.createSqlObject(newobj);
                     }
+                    else if (!testEqualFullNames(oldobj, newobj, opts)) {
+                        plan.renameSqlObject(oldobj, newobj.pureName);
+                    }
                 }
             }
         }

package/lib/packageTools.js

@@ -41,6 +41,9 @@ function extractShellApiFunctionName(functionName) {
 }
 exports.extractShellApiFunctionName = extractShellApiFunctionName;
 function findEngineDriver(connection, extensions) {
+    if (!extensions) {
+        return null;
+    }
     if ((0, isString_1.default)(connection)) {
         return extensions.drivers.find(x => x.engine == connection);
     }

package/lib/structureTools.js

@@ -96,7 +96,7 @@ 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)) });
+    return Object.assign(Object.assign({}, db), { tables: (db.tables || []).filter(x => !regex.test(x.pureName)), views: (db.views || []).filter(x => !regex.test(x.pureName)), collections: (db.collections || []).filter(x => !regex.test(x.pureName)), matviews: (db.matviews || []).filter(x => !regex.test(x.pureName)), procedures: (db.procedures || []).filter(x => !regex.test(x.pureName)), functions: (db.functions || []).filter(x => !regex.test(x.pureName)), triggers: (db.triggers || []).filter(x => !regex.test(x.pureName)) });
 }
 exports.skipNamesInStructureByRegex = skipNamesInStructureByRegex;
 function detectChangesInPreloadedRows(oldTable, newTable) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.5.7-alpha.53",
+  "version": "5.5.7-alpha.68",
   "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.53",
+    "dbgate-types": "^5.5.7-alpha.68",
     "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.53",
+    "dbgate-sqltree": "^5.5.7-alpha.68",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",