dbgate-tools 4.4.3 → 4.5.1

package/lib/SqlDumper.d.ts

@@ -101,5 +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;
+    fillPreloadedRows(table: NamedObjectInfo, oldRows: any[], newRows: any[], key: string[], insertOnly: string[]): void;
 }

package/lib/SqlDumper.js

@@ -532,7 +532,7 @@ class SqlDumper {
     dropSqlObject(obj) {
         this.putCmd('^drop %s %f', this.getSqlObjectSqlName(obj.objectTypeField), obj);
     }
-    fillPreloadedRows(table, oldRows, newRows, key) {
+    fillPreloadedRows(table, oldRows, newRows, key, insertOnly) {
         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]));
@@ -540,7 +540,7 @@ class SqlDumper {
             if (old) {
                 const updated = [];
                 for (const col of rowKeys) {
-                    if (row[col] != old[col]) {
+                    if (row[col] != old[col] && !(insertOnly === null || insertOnly === void 0 ? void 0 : insertOnly.includes(col))) {
                         updated.push(col);
                     }
                 }

package/lib/alterPlan.d.ts

@@ -68,6 +68,7 @@ interface AlterOperation_FillPreloadedRows {
     oldRows: any[];
     newRows: any[];
     key: string[];
+    insertOnly: 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 {
@@ -96,7 +97,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;
+    fillPreloadedRows(table: NamedObjectInfo, oldRows: any[], newRows: any[], key: string[], insertOnly: string[]): void;
     run(processor: AlterProcessor): void;
     _getDependendColumnConstraints(column: ColumnInfo, dependencyDefinition: any): import("dbgate-types/dbinfo").PrimaryKeyInfo[];
     _addLogicalDependencies(): AlterOperation[];

package/lib/alterPlan.js

@@ -112,13 +112,14 @@ class AlterPlan {
         });
         this.recreates.tables += 1;
     }
-    fillPreloadedRows(table, oldRows, newRows, key) {
+    fillPreloadedRows(table, oldRows, newRows, key, insertOnly) {
         this.operations.push({
             operationType: 'fillPreloadedRows',
             table,
             oldRows,
             newRows,
             key,
+            insertOnly,
         });
     }
     run(processor) {
@@ -407,7 +408,7 @@ function runAlterOperation(op, processor) {
             processor.dropSqlObject(op.oldObject);
             break;
         case 'fillPreloadedRows':
-            processor.fillPreloadedRows(op.table, op.oldRows, op.newRows, op.key);
+            processor.fillPreloadedRows(op.table, op.oldRows, op.newRows, op.key, op.insertOnly);
             break;
         case 'recreateTable':
             {

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

@@ -16,5 +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;
+    fillPreloadedRows(table: NamedObjectInfo, oldRows: any[], newRows: any[], key: string[], insertOnly: string[]): void;
 }

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

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

package/lib/diffTools.js

@@ -238,7 +238,7 @@ 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);
+        plan.fillPreloadedRows(newTable, oldTable === null || oldTable === void 0 ? void 0 : oldTable.preloadedRows, newTable.preloadedRows, key, newTable.preloadedRowsInsertOnly);
     }
 }
 function planAlterTable(plan, oldTable, newTable, opts) {

package/lib/driverBase.d.ts

@@ -16,4 +16,8 @@ export declare const driverBase: {
     analyseIncremental(pool: any, structure: any, version: any): Promise<any>;
     createDumper(options?: any): any;
     script(pool: any, sql: any): Promise<void>;
+    getNewObjectTemplates(): {
+        label: string;
+        sql: string;
+    }[];
 };

package/lib/driverBase.js

@@ -57,4 +57,11 @@ exports.driverBase = {
             }
         });
     },
+    getNewObjectTemplates() {
+        var _a;
+        if (!((_a = this.dialect) === null || _a === void 0 ? void 0 : _a.nosql)) {
+            return [{ label: 'New view', sql: 'CREATE VIEW myview\nAS\nSELECT * FROM table1' }];
+        }
+        return [];
+    },
 };

package/lib/preloadedRowsTools.js

@@ -21,7 +21,7 @@ function enrichWithPreloadedRows(dbModel, dbTarget, conn, driver) {
         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)
+            if ((((_a = tableModel === null || tableModel === void 0 ? void 0 : 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)
@@ -32,7 +32,7 @@ function enrichWithPreloadedRows(dbModel, dbTarget, conn, driver) {
             }
             else {
                 dmp.put('^select * ^from %f ^where', tableTarget);
-                dmp.putCollection(' ^or ', tableTarget.preloadedRows, row => {
+                dmp.putCollection(' ^or ', tableModel.preloadedRows, row => {
                     dmp.put('(');
                     dmp.putCollection(' ^and ', keyColumns, col => dmp.put('%i=%v', col, row[col]));
                     dmp.put(')');

package/lib/yamlModelConv.d.ts

@@ -3,6 +3,7 @@ export interface ColumnInfoYaml {
     name: string;
     type: string;
     notNull?: boolean;
+    length?: number;
     autoIncrement?: boolean;
     references?: string;
     primaryKey?: boolean;
@@ -17,6 +18,7 @@ export interface TableInfoYaml {
     columns: ColumnInfoYaml[];
     primaryKey?: string[];
     insertKey?: string[];
+    insertOnly?: string[];
     data?: any[];
 }
 export interface ForeignKeyInfoYaml {

package/lib/yamlModelConv.js

@@ -36,7 +36,7 @@ function columnInfoFromYaml(column, table) {
     const res = {
         pureName: table.name,
         columnName: column.name,
-        dataType: column.type,
+        dataType: column.length ? `${column.type}(${column.length})` : column.type,
         autoIncrement: column.autoIncrement,
         notNull: column.notNull || (table.primaryKey && table.primaryKey.includes(column.name)),
     };
@@ -87,6 +87,7 @@ function tableInfoFromYaml(table, allTables) {
     }
     res.preloadedRows = table.data;
     res.preloadedRowsKey = table.insertKey;
+    res.preloadedRowsInsertOnly = table.insertOnly;
     return res;
 }
 exports.tableInfoFromYaml = tableInfoFromYaml;

package/package.json

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