dbgate-datalib 4.4.5-alpha.1 → 4.6.1

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

@@ -13,6 +13,7 @@ export interface DisplayColumn {
     autoIncrement?: boolean;
     isPrimaryKey?: boolean;
     foreignKey?: ForeignKeyInfo;
+    isForeignKeyUnique?: boolean;
     isExpandable?: boolean;
     isChecked?: boolean;
     hintColumnNames?: string[];
@@ -55,11 +56,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/JslGridDisplay.js

@@ -12,7 +12,7 @@ class JslGridDisplay extends GridDisplay_1.GridDisplay {
         var _a;
         super(config, setConfig, cache, setCache, null);
         this.filterable = true;
-        if (structure.columns) {
+        if (structure === null || structure === void 0 ? void 0 : structure.columns) {
             this.columns = lodash_1.default.uniqBy((_a = structure.columns
                 .map(col => ({
                 columnName: col.columnName,
@@ -25,7 +25,7 @@ class JslGridDisplay extends GridDisplay_1.GridDisplay {
                 schemaName: null,
             }))) === null || _a === void 0 ? void 0 : _a.map(col => (Object.assign(Object.assign({}, col), { isChecked: this.isColumnChecked(col) }))), col => col.uniqueName);
         }
-        if (structure.__isDynamicStructure) {
+        if (structure === null || structure === void 0 ? void 0 : structure.__isDynamicStructure) {
             this.columns = (0, CollectionGridDisplay_1.analyseCollectionDisplayColumns)(rows, this);
         }
         if (!this.columns)

package/lib/TableGridDisplay.d.ts

@@ -32,6 +32,7 @@ export declare class TableGridDisplay extends GridDisplay {
         uniquePath: string[];
         isPrimaryKey: boolean;
         foreignKey: ForeignKeyInfo;
+        isForeignKeyUnique: boolean;
         pairingId?: string;
         columnName: string;
         notNull: boolean;
@@ -64,6 +65,7 @@ export declare class TableGridDisplay extends GridDisplay {
         uniquePath: string[];
         isPrimaryKey: boolean;
         foreignKey: ForeignKeyInfo;
+        isForeignKeyUnique: boolean;
         pairingId?: string;
         columnName: string;
         notNull: boolean;

package/lib/TableGridDisplay.js

@@ -41,7 +41,7 @@ class TableGridDisplay extends GridDisplay_1.GridDisplay {
         var _a, _b;
         return (((_b = (_a = table === null || table === void 0 ? void 0 : table.columns) === null || _a === void 0 ? void 0 : _a.map(col => this.getDisplayColumn(table, col, parentPath))) === null || _b === void 0 ? void 0 : _b.map(col => {
             var _a, _b, _c;
-            return (Object.assign(Object.assign({}, col), { isChecked: this.isColumnChecked(col), hintColumnNames: ((_b = (_a = this.getFkDictionaryDescription(col.foreignKey)) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.map(columnName => `hint_${col.uniqueName}_${columnName}`)) || null, hintColumnDelimiter: (_c = this.getFkDictionaryDescription(col.foreignKey)) === null || _c === void 0 ? void 0 : _c.delimiter, isExpandable: !!col.foreignKey }));
+            return (Object.assign(Object.assign({}, col), { isChecked: this.isColumnChecked(col), hintColumnNames: ((_b = (_a = this.getFkDictionaryDescription(col.isForeignKeyUnique ? col.foreignKey : null)) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.map(columnName => `hint_${col.uniqueName}_${columnName}`)) || null, hintColumnDelimiter: (_c = this.getFkDictionaryDescription(col.isForeignKeyUnique ? col.foreignKey : null)) === null || _c === void 0 ? void 0 : _c.delimiter, isExpandable: !!col.foreignKey }));
         })) || []);
     }
     addJoinsFromExpandedColumns(select, columns, parentAlias, columnSources) {
@@ -148,7 +148,9 @@ class TableGridDisplay extends GridDisplay_1.GridDisplay {
         return [];
     }
     getFkTarget(column) {
-        const { uniqueName, foreignKey } = column;
+        const { uniqueName, foreignKey, isForeignKeyUnique } = column;
+        if (!isForeignKeyUnique)
+            return null;
         const pureName = foreignKey.refTableName;
         const schemaName = foreignKey.refSchemaName;
         return this.findTable({ schemaName, pureName });
@@ -172,9 +174,16 @@ class TableGridDisplay extends GridDisplay_1.GridDisplay {
         const uniquePath = [...parentPath, col.columnName];
         const uniqueName = uniquePath.join('.');
         // console.log('this.config.addedColumns', this.config.addedColumns, uniquePath);
-        return Object.assign(Object.assign({}, col), { pureName: table.pureName, schemaName: table.schemaName, headerText: uniquePath.length == 1 ? col.columnName : `${table.pureName}.${col.columnName}`, uniqueName,
+        const res = Object.assign(Object.assign({}, col), { pureName: table.pureName, schemaName: table.schemaName, headerText: uniquePath.length == 1 ? col.columnName : `${table.pureName}.${col.columnName}`, uniqueName,
             uniquePath, isPrimaryKey: table.primaryKey && !!table.primaryKey.columns.find(x => x.columnName == col.columnName), foreignKey: table.foreignKeys &&
-                table.foreignKeys.find(fk => fk.columns.length == 1 && fk.columns[0].columnName == col.columnName) });
+                table.foreignKeys.find(fk => fk.columns.length == 1 && fk.columns[0].columnName == col.columnName), isForeignKeyUnique: false });
+        if (res.foreignKey) {
+            const refTableInfo = this.dbinfo.tables.find(x => x.schemaName == res.foreignKey.refSchemaName && x.pureName == res.foreignKey.refTableName);
+            if (refTableInfo && (0, dbgate_tools_1.isTableColumnUnique)(refTableInfo, res.foreignKey.columns[0].refColumnName)) {
+                res.isForeignKeyUnique = true;
+            }
+        }
+        return res;
     }
     addAddedColumnsToSelect(select, columns, parentAlias, displayedColumnInfo) {
         for (const column of columns) {

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.6.1",
   "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.6.1",
+    "dbgate-filterparser": "^4.6.1"
   },
   "devDependencies": {
-    "dbgate-types": "^4.4.5-alpha.1",
+    "dbgate-types": "^4.6.1",
     "@types/node": "^13.7.0",
     "typescript": "^4.4.3"
   }