dbgate-datalib 4.4.5-alpha.1 → 4.5.0

package/lib/GridConfig.d.ts

@@ -16,7 +16,7 @@ export interface GridConfig extends GridConfigColumns {
     filters: {
         [uniqueName: string]: string;
     };
-    focusedColumn?: string;
+    focusedColumns?: string[];
     columnWidths: {
         [uniqueName: string]: number;
     };

package/lib/GridConfig.js

@@ -9,7 +9,7 @@ function createGridConfig() {
         filters: {},
         columnWidths: {},
         sort: [],
-        focusedColumn: null,
+        focusedColumns: null,
         grouping: {},
         formFilterColumns: [],
     };

package/lib/GridDisplay.d.ts

@@ -55,11 +55,12 @@ export declare abstract class GridDisplay {
     isDynamicStructure: boolean;
     setColumnVisibility(uniquePath: string[], isVisible: boolean): void;
     addDynamicColumn(name: string): void;
-    focusColumn(uniqueName: string): void;
+    focusColumns(uniqueNames: string[]): void;
     get hasReferences(): boolean;
-    get focusedColumn(): string;
+    get focusedColumns(): string[];
     get engine(): string;
     get allColumns(): DisplayColumn[];
+    findColumn(uniqueName: string): DisplayColumn;
     getFkTarget(column: DisplayColumn): TableInfo;
     reload(): void;
     includeInColumnSet(field: keyof GridConfigColumns, uniqueName: string, isIncluded: boolean): void;

package/lib/GridDisplay.js

@@ -52,14 +52,14 @@ class GridDisplay {
     addDynamicColumn(name) {
         this.includeInColumnSet('addedColumns', name, true);
     }
-    focusColumn(uniqueName) {
-        this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { focusedColumn: uniqueName })));
+    focusColumns(uniqueNames) {
+        this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { focusedColumns: uniqueNames })));
     }
     get hasReferences() {
         return false;
     }
-    get focusedColumn() {
-        return this.config.focusedColumn;
+    get focusedColumns() {
+        return this.config.focusedColumns;
     }
     get engine() {
         var _a;
@@ -68,6 +68,9 @@ class GridDisplay {
     get allColumns() {
         return this.getColumns(null).filter(col => col.isChecked || col.uniquePath.length == 1);
     }
+    findColumn(uniqueName) {
+        return this.getColumns(null).find(x => x.uniqueName == uniqueName);
+    }
     getFkTarget(column) {
         return null;
     }

package/lib/deleteCascade.js

@@ -7,15 +7,18 @@ exports.getDeleteCascades = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const ChangeSet_1 = require("./ChangeSet");
 // function getDeleteScript()
-function processDependencies(changeSet, result, allForeignKeys, fkPath, table, baseCmd, dbinfo) {
+function processDependencies(changeSet, result, allForeignKeys, fkPath, table, baseCmd, dbinfo, usedTables) {
     if (result.find(x => x.title == table.pureName))
         return;
     const dependencies = allForeignKeys.filter(x => x.refSchemaName == table.schemaName && x.refTableName == table.pureName);
     for (const fk of dependencies) {
         const depTable = dbinfo.tables.find(x => x.pureName == fk.pureName && x.schemaName == fk.schemaName);
         const subFkPath = [...fkPath, fk];
-        if (depTable && depTable.pureName != baseCmd.pureName) {
-            processDependencies(changeSet, result, allForeignKeys, subFkPath, depTable, baseCmd, dbinfo);
+        if (depTable && !usedTables.includes(depTable.pureName)) {
+            processDependencies(changeSet, result, allForeignKeys, subFkPath, depTable, baseCmd, dbinfo, [
+                ...usedTables,
+                depTable.pureName,
+            ]);
         }
         const refCmd = {
             commandType: 'delete',
@@ -103,7 +106,7 @@ function getDeleteCascades(changeSet, dbinfo) {
         const table = dbinfo.tables.find(x => x.pureName == baseCmd.pureName && x.schemaName == baseCmd.schemaName);
         if (!table.primaryKey)
             continue;
-        processDependencies(changeSet, result, allForeignKeys, [], table, baseCmd, dbinfo);
+        processDependencies(changeSet, result, allForeignKeys, [], table, baseCmd, dbinfo, [table.pureName]);
         // let resItem = result.find(x => x.title == baseCmd.pureName);
         // if (!resItem) {
         //   resItem = {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.4.5-alpha.1",
+  "version": "4.5.0",
   "name": "dbgate-datalib",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -11,11 +11,11 @@
     "lib"
   ],
   "dependencies": {
-    "dbgate-sqltree": "^4.4.5-alpha.1",
-    "dbgate-filterparser": "^4.4.5-alpha.1"
+    "dbgate-sqltree": "^4.5.0",
+    "dbgate-filterparser": "^4.5.0"
   },
   "devDependencies": {
-    "dbgate-types": "^4.4.5-alpha.1",
+    "dbgate-types": "^4.5.0",
     "@types/node": "^13.7.0",
     "typescript": "^4.4.3"
   }