dbgate-datalib 4.6.0 → 4.7.0

package/lib/ChangeSet.js

@@ -251,6 +251,16 @@ function revertChangeSetRowChanges(changeSet, definition) {
     return changeSet;
 }
 exports.revertChangeSetRowChanges = revertChangeSetRowChanges;
+function consolidateInsertIndexes(changeSet, name) {
+    const indexes = changeSet.inserts
+        .filter(x => x.pureName == name.pureName && x.schemaName == name.schemaName)
+        .map(x => x.insertedRowIndex);
+    indexes.sort((a, b) => a - b);
+    if (indexes[indexes.length - 1] != indexes.length - 1) {
+        return Object.assign(Object.assign({}, changeSet), { inserts: changeSet.inserts.map(x => (Object.assign(Object.assign({}, x), { insertedRowIndex: indexes.indexOf(x.insertedRowIndex) }))) });
+    }
+    return changeSet;
+}
 function deleteChangeSetRows(changeSet, definition) {
     let [fieldName, existingItem] = findExistingChangeSetItem(changeSet, definition);
     if (fieldName == 'updates') {
@@ -258,7 +268,7 @@ function deleteChangeSetRows(changeSet, definition) {
         [fieldName, existingItem] = findExistingChangeSetItem(changeSet, definition);
     }
     if (fieldName == 'inserts') {
-        return revertChangeSetRowChanges(changeSet, definition);
+        return consolidateInsertIndexes(revertChangeSetRowChanges(changeSet, definition), definition);
     }
     else {
         if (existingItem && fieldName == 'deletes')

package/lib/FreeTableGridDisplay.d.ts

@@ -25,6 +25,9 @@ export declare class FreeTableGridDisplay extends GridDisplay {
         isSparse?: boolean;
         defaultValue?: string;
         defaultConstraint?: string;
+        columnComment?: string;
+        isUnsigned?: boolean;
+        isZerofill?: boolean;
     }[];
     getDisplayColumn(col: ColumnInfo): {
         pureName: string;
@@ -45,5 +48,8 @@ export declare class FreeTableGridDisplay extends GridDisplay {
         isSparse?: boolean;
         defaultValue?: string;
         defaultConstraint?: string;
+        columnComment?: string;
+        isUnsigned?: boolean;
+        isZerofill?: boolean;
     };
 }

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[];
@@ -53,6 +54,7 @@ export declare abstract class GridDisplay {
     isLoadedCorrectly: boolean;
     supportsReload: boolean;
     isDynamicStructure: boolean;
+    filterTypeOverride: any;
     setColumnVisibility(uniquePath: string[], isVisible: boolean): void;
     addDynamicColumn(name: string): void;
     focusColumns(uniqueNames: string[]): void;

package/lib/GridDisplay.js

@@ -27,6 +27,7 @@ class GridDisplay {
         this.isLoadedCorrectly = true;
         this.supportsReload = false;
         this.isDynamicStructure = false;
+        this.filterTypeOverride = null;
         this.dialect = ((driver === null || driver === void 0 ? void 0 : driver.dialectByVersion) && (driver === null || driver === void 0 ? void 0 : driver.dialectByVersion(serverVersion))) || (driver === null || driver === void 0 ? void 0 : driver.dialect);
     }
     get baseTableOrSimilar() {
@@ -462,22 +463,23 @@ class GridDisplay {
         return sql;
     }
     compileFilters() {
+        var _a;
         const filters = this.config && this.config.filters;
         if (!filters)
             return null;
         const conditions = [];
         for (const name in filters) {
-            const column = this.columns.find(x => (x.columnName = name));
-            if (!column)
+            const column = this.isDynamicStructure ? null : this.columns.find(x => x.columnName == name);
+            if (!this.isDynamicStructure && !column)
                 continue;
-            const filterType = (0, dbgate_filterparser_1.getFilterType)(column.dataType);
+            const filterType = this.isDynamicStructure ? (_a = this.filterTypeOverride) !== null && _a !== void 0 ? _a : 'mongo' : (0, dbgate_filterparser_1.getFilterType)(column.dataType);
             try {
                 const condition = (0, dbgate_filterparser_1.parseFilter)(filters[name], filterType);
                 const replaced = lodash_1.default.cloneDeepWith(condition, (expr) => {
                     if (expr.exprType == 'placeholder')
                         return {
                             exprType: 'column',
-                            columnName: column.columnName,
+                            columnName: this.isDynamicStructure ? name : column.columnName,
                         };
                 });
                 conditions.push(replaced);

package/lib/JslGridDisplay.d.ts

@@ -1,5 +1,5 @@
 import { GridDisplay, ChangeCacheFunc, ChangeConfigFunc } from './GridDisplay';
 import { GridConfig, GridCache } from './GridConfig';
 export declare class JslGridDisplay extends GridDisplay {
-    constructor(jslid: any, structure: any, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, rows: any);
+    constructor(jslid: any, structure: any, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, rows: any, isDynamicStructure: boolean, supportsReload: boolean);
 }

package/lib/JslGridDisplay.js

@@ -8,11 +8,15 @@ const lodash_1 = __importDefault(require("lodash"));
 const GridDisplay_1 = require("./GridDisplay");
 const CollectionGridDisplay_1 = require("./CollectionGridDisplay");
 class JslGridDisplay extends GridDisplay_1.GridDisplay {
-    constructor(jslid, structure, config, setConfig, cache, setCache, rows) {
+    constructor(jslid, structure, config, setConfig, cache, setCache, rows, isDynamicStructure, supportsReload) {
         var _a;
         super(config, setConfig, cache, setCache, null);
         this.filterable = true;
-        if (structure.columns) {
+        this.supportsReload = supportsReload;
+        this.isDynamicStructure = isDynamicStructure;
+        if (isDynamicStructure)
+            this.filterTypeOverride = 'string';
+        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 +29,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;
@@ -45,6 +46,9 @@ export declare class TableGridDisplay extends GridDisplay {
         isSparse?: boolean;
         defaultValue?: string;
         defaultConstraint?: string;
+        columnComment?: string;
+        isUnsigned?: boolean;
+        isZerofill?: boolean;
     }[];
     addJoinsFromExpandedColumns(select: Select, columns: DisplayColumn[], parentAlias: string, columnSources: any): void;
     addReferenceToSelect(select: Select, parentAlias: string, column: DisplayColumn): void;
@@ -64,6 +68,7 @@ export declare class TableGridDisplay extends GridDisplay {
         uniquePath: string[];
         isPrimaryKey: boolean;
         foreignKey: ForeignKeyInfo;
+        isForeignKeyUnique: boolean;
         pairingId?: string;
         columnName: string;
         notNull: boolean;
@@ -77,6 +82,9 @@ export declare class TableGridDisplay extends GridDisplay {
         isSparse?: boolean;
         defaultValue?: string;
         defaultConstraint?: string;
+        columnComment?: string;
+        isUnsigned?: boolean;
+        isZerofill?: boolean;
     };
     addAddedColumnsToSelect(select: Select, columns: DisplayColumn[], parentAlias: string, displayedColumnInfo: DisplayedColumnInfo): void;
     get hasReferences(): 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/ViewGridDisplay.d.ts

@@ -24,6 +24,9 @@ export declare class ViewGridDisplay extends GridDisplay {
         isSparse?: boolean;
         defaultValue?: string;
         defaultConstraint?: string;
+        columnComment?: string;
+        isUnsigned?: boolean;
+        isZerofill?: boolean;
     }[];
     getDisplayColumn(view: ViewInfo, col: ColumnInfo): {
         pureName: string;
@@ -44,6 +47,9 @@ export declare class ViewGridDisplay extends GridDisplay {
         isSparse?: boolean;
         defaultValue?: string;
         defaultConstraint?: string;
+        columnComment?: string;
+        isUnsigned?: boolean;
+        isZerofill?: boolean;
     };
     createSelect(options?: {}): import("dbgate-sqltree").Select;
 }

package/package.json

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