dbgate-datalib 4.5.0 → 4.6.2

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[];

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/package.json

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