dbgate-datalib 4.3.4 → 4.4.1

package/lib/FreeTableGridDisplay.d.ts

@@ -17,14 +17,14 @@ export declare class FreeTableGridDisplay extends GridDisplay {
         notNull: boolean;
         autoIncrement: boolean;
         dataType: string;
-        precision: number;
-        scale: number;
-        length: number;
-        computedExpression: string;
-        isPersisted: boolean;
-        isSparse: boolean;
-        defaultValue: string;
-        defaultConstraint: string;
+        precision?: number;
+        scale?: number;
+        length?: number;
+        computedExpression?: string;
+        isPersisted?: boolean;
+        isSparse?: boolean;
+        defaultValue?: string;
+        defaultConstraint?: string;
     }[];
     getDisplayColumn(col: ColumnInfo): {
         pureName: string;
@@ -37,13 +37,13 @@ export declare class FreeTableGridDisplay extends GridDisplay {
         notNull: boolean;
         autoIncrement: boolean;
         dataType: string;
-        precision: number;
-        scale: number;
-        length: number;
-        computedExpression: string;
-        isPersisted: boolean;
-        isSparse: boolean;
-        defaultValue: string;
-        defaultConstraint: string;
+        precision?: number;
+        scale?: number;
+        length?: number;
+        computedExpression?: string;
+        isPersisted?: boolean;
+        isSparse?: boolean;
+        defaultValue?: string;
+        defaultConstraint?: string;
     };
 }

package/lib/GridDisplay.d.ts

@@ -15,7 +15,7 @@ export interface DisplayColumn {
     foreignKey?: ForeignKeyInfo;
     isExpandable?: boolean;
     isChecked?: boolean;
-    hintColumnName?: string;
+    hintColumnNames?: string[];
     dataType?: string;
     filterType?: boolean;
     isStructured?: boolean;

package/lib/TableFormViewDisplay.d.ts

@@ -4,10 +4,11 @@ import { EngineDriver, NamedObjectInfo, DatabaseInfo } from 'dbgate-types';
 import { GridConfig, GridCache } from './GridConfig';
 import { Select, Condition } from 'dbgate-sqltree';
 import { ChangeSetFieldDefinition, ChangeSetRowDefinition } from './ChangeSet';
+import { DictionaryDescriptionFunc } from '.';
 export declare class TableFormViewDisplay extends FormViewDisplay {
     tableName: NamedObjectInfo;
     private gridDisplay;
-    constructor(tableName: NamedObjectInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, dbinfo: DatabaseInfo, displayOptions: any, serverVersion: any);
+    constructor(tableName: NamedObjectInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, dbinfo: DatabaseInfo, displayOptions: any, serverVersion: any, getDictionaryDescription?: DictionaryDescriptionFunc);
     addDisplayColumns(columns: DisplayColumn[]): void;
     getPrimaryKeyEqualCondition(row?: any): Condition;
     getPrimaryKeyOperatorCondition(operator: any): Condition;

package/lib/TableFormViewDisplay.js

@@ -9,10 +9,10 @@ const dbgate_sqltree_1 = require("dbgate-sqltree");
 const TableGridDisplay_1 = require("./TableGridDisplay");
 const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
 class TableFormViewDisplay extends FormViewDisplay_1.FormViewDisplay {
-    constructor(tableName, driver, config, setConfig, cache, setCache, dbinfo, displayOptions, serverVersion) {
+    constructor(tableName, driver, config, setConfig, cache, setCache, dbinfo, displayOptions, serverVersion, getDictionaryDescription = null) {
         super(config, setConfig, cache, setCache, driver, dbinfo, serverVersion);
         this.tableName = tableName;
-        this.gridDisplay = new TableGridDisplay_1.TableGridDisplay(tableName, driver, config, setConfig, cache, setCache, dbinfo, displayOptions, serverVersion);
+        this.gridDisplay = new TableGridDisplay_1.TableGridDisplay(tableName, driver, config, setConfig, cache, setCache, dbinfo, displayOptions, serverVersion, getDictionaryDescription);
         this.gridDisplay.addAllExpandedColumnsToSelected = true;
         this.isLoadedCorrectly = this.gridDisplay.isLoadedCorrectly && !!this.driver;
         this.columns = [];

package/lib/TableGridDisplay.d.ts

@@ -1,21 +1,29 @@
 import { GridDisplay, ChangeCacheFunc, DisplayColumn, DisplayedColumnInfo, ChangeConfigFunc } from './GridDisplay';
-import { TableInfo, EngineDriver, ColumnInfo, NamedObjectInfo, DatabaseInfo } from 'dbgate-types';
+import { TableInfo, EngineDriver, ColumnInfo, NamedObjectInfo, DatabaseInfo, ForeignKeyInfo } from 'dbgate-types';
 import { GridConfig, GridCache } from './GridConfig';
 import { Select } from 'dbgate-sqltree';
+export interface DictionaryDescription {
+    expression: string;
+    columns: string[];
+    delimiter: string;
+}
+export declare type DictionaryDescriptionFunc = (table: TableInfo) => DictionaryDescription;
 export declare class TableGridDisplay extends GridDisplay {
     tableName: NamedObjectInfo;
     displayOptions: any;
+    getDictionaryDescription: DictionaryDescriptionFunc;
     table: TableInfo;
     addAllExpandedColumnsToSelected: boolean;
     hintBaseColumns: DisplayColumn[];
-    constructor(tableName: NamedObjectInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, dbinfo: DatabaseInfo, displayOptions: any, serverVersion: any);
+    constructor(tableName: NamedObjectInfo, driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, dbinfo: DatabaseInfo, displayOptions: any, serverVersion: any, getDictionaryDescription?: DictionaryDescriptionFunc);
     findTable({ schemaName, pureName }: {
         schemaName?: any;
         pureName: any;
     }): TableInfo;
     getDisplayColumns(table: TableInfo, parentPath: string[]): {
         isChecked: boolean;
-        hintColumnName: string;
+        hintColumnNames: string[];
+        hintColumnDelimiter: string;
         isExpandable: boolean;
         pureName: string;
         schemaName: string;
@@ -23,23 +31,24 @@ export declare class TableGridDisplay extends GridDisplay {
         uniqueName: string;
         uniquePath: string[];
         isPrimaryKey: boolean;
-        foreignKey: import("dbgate-types").ForeignKeyInfo;
+        foreignKey: ForeignKeyInfo;
         pairingId?: string;
         columnName: string;
         notNull: boolean;
         autoIncrement: boolean;
         dataType: string;
-        precision: number;
-        scale: number;
-        length: number;
-        computedExpression: string;
-        isPersisted: boolean;
-        isSparse: boolean;
-        defaultValue: string;
-        defaultConstraint: string;
+        precision?: number;
+        scale?: number;
+        length?: number;
+        computedExpression?: string;
+        isPersisted?: boolean;
+        isSparse?: boolean;
+        defaultValue?: string;
+        defaultConstraint?: string;
     }[];
     addJoinsFromExpandedColumns(select: Select, columns: DisplayColumn[], parentAlias: string, columnSources: any): void;
     addReferenceToSelect(select: Select, parentAlias: string, column: DisplayColumn): void;
+    getFkDictionaryDescription(foreignKey: ForeignKeyInfo): DictionaryDescription;
     addHintsToSelect(select: Select): boolean;
     enrichExpandedColumns(list: DisplayColumn[]): DisplayColumn[];
     getExpandedColumns(column: DisplayColumn): DisplayColumn[];
@@ -54,20 +63,20 @@ export declare class TableGridDisplay extends GridDisplay {
         uniqueName: string;
         uniquePath: string[];
         isPrimaryKey: boolean;
-        foreignKey: import("dbgate-types").ForeignKeyInfo;
+        foreignKey: ForeignKeyInfo;
         pairingId?: string;
         columnName: string;
         notNull: boolean;
         autoIncrement: boolean;
         dataType: string;
-        precision: number;
-        scale: number;
-        length: number;
-        computedExpression: string;
-        isPersisted: boolean;
-        isSparse: boolean;
-        defaultValue: string;
-        defaultConstraint: string;
+        precision?: number;
+        scale?: number;
+        length?: number;
+        computedExpression?: string;
+        isPersisted?: boolean;
+        isSparse?: boolean;
+        defaultValue?: string;
+        defaultConstraint?: string;
     };
     addAddedColumnsToSelect(select: Select, columns: DisplayColumn[], parentAlias: string, displayedColumnInfo: DisplayedColumnInfo): void;
     get hasReferences(): boolean;

package/lib/TableGridDisplay.js

@@ -4,10 +4,11 @@ exports.TableGridDisplay = void 0;
 const dbgate_tools_1 = require("dbgate-tools");
 const GridDisplay_1 = require("./GridDisplay");
 class TableGridDisplay extends GridDisplay_1.GridDisplay {
-    constructor(tableName, driver, config, setConfig, cache, setCache, dbinfo, displayOptions, serverVersion) {
+    constructor(tableName, driver, config, setConfig, cache, setCache, dbinfo, displayOptions, serverVersion, getDictionaryDescription = null) {
         super(config, setConfig, cache, setCache, driver, dbinfo, serverVersion);
         this.tableName = tableName;
         this.displayOptions = displayOptions;
+        this.getDictionaryDescription = getDictionaryDescription;
         this.addAllExpandedColumnsToSelected = false;
         this.table = this.findTable(tableName);
         if (!this.table) {
@@ -38,7 +39,10 @@ class TableGridDisplay extends GridDisplay_1.GridDisplay {
     }
     getDisplayColumns(table, parentPath) {
         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 => (Object.assign(Object.assign({}, col), { isChecked: this.isColumnChecked(col), hintColumnName: col.foreignKey ? `hint_${col.uniqueName}` : null, isExpandable: !!col.foreignKey })))) || []);
+        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 }));
+        })) || []);
     }
     addJoinsFromExpandedColumns(select, columns, parentAlias, columnSources) {
         for (const column of columns) {
@@ -86,6 +90,18 @@ class TableGridDisplay extends GridDisplay_1.GridDisplay {
             ];
         }
     }
+    getFkDictionaryDescription(foreignKey) {
+        if (!foreignKey)
+            return null;
+        const pureName = foreignKey.refTableName;
+        const schemaName = foreignKey.refSchemaName;
+        const table = this.findTable({ schemaName, pureName });
+        if (table && table.columns && table.columns.length > 0 && table.primaryKey) {
+            const hintDescription = this.getDictionaryDescription(table);
+            return hintDescription;
+        }
+        return null;
+    }
     addHintsToSelect(select) {
         let res = false;
         const groupColumns = this.groupColumns;
@@ -96,17 +112,18 @@ class TableGridDisplay extends GridDisplay_1.GridDisplay {
                 }
                 const table = this.getFkTarget(column);
                 if (table && table.columns && table.columns.length > 0 && table.primaryKey) {
-                    const hintColumn = table.columns.find(x => { var _a, _b; return (_b = (_a = x === null || x === void 0 ? void 0 : x.dataType) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === null || _b === void 0 ? void 0 : _b.includes('char'); });
-                    if (hintColumn) {
+                    // const hintColumn = table.columns.find(x => x?.dataType?.toLowerCase()?.includes('char'));
+                    const hintDescription = this.getDictionaryDescription(table);
+                    if (hintDescription) {
                         const parentUniqueName = column.uniquePath.slice(0, -1).join('.');
                         this.addReferenceToSelect(select, parentUniqueName ? `${parentUniqueName}_ref` : 'basetbl', column);
                         const childAlias = `${column.uniqueName}_ref`;
-                        select.columns.push({
+                        select.columns.push(...hintDescription.columns.map(columnName => ({
                             exprType: 'column',
-                            columnName: hintColumn.columnName,
-                            alias: `hint_${column.uniqueName}`,
+                            columnName,
+                            alias: `hint_${column.uniqueName}_${columnName}`,
                             source: { alias: childAlias },
-                        });
+                        })));
                         res = true;
                     }
                 }

package/lib/ViewGridDisplay.d.ts

@@ -16,14 +16,14 @@ export declare class ViewGridDisplay extends GridDisplay {
         notNull: boolean;
         autoIncrement: boolean;
         dataType: string;
-        precision: number;
-        scale: number;
-        length: number;
-        computedExpression: string;
-        isPersisted: boolean;
-        isSparse: boolean;
-        defaultValue: string;
-        defaultConstraint: string;
+        precision?: number;
+        scale?: number;
+        length?: number;
+        computedExpression?: string;
+        isPersisted?: boolean;
+        isSparse?: boolean;
+        defaultValue?: string;
+        defaultConstraint?: string;
     }[];
     getDisplayColumn(view: ViewInfo, col: ColumnInfo): {
         pureName: string;
@@ -36,14 +36,14 @@ export declare class ViewGridDisplay extends GridDisplay {
         notNull: boolean;
         autoIncrement: boolean;
         dataType: string;
-        precision: number;
-        scale: number;
-        length: number;
-        computedExpression: string;
-        isPersisted: boolean;
-        isSparse: boolean;
-        defaultValue: string;
-        defaultConstraint: string;
+        precision?: number;
+        scale?: number;
+        length?: number;
+        computedExpression?: string;
+        isPersisted?: boolean;
+        isSparse?: boolean;
+        defaultValue?: string;
+        defaultConstraint?: string;
     };
     createSelect(options?: {}): import("dbgate-sqltree").Select;
 }

package/package.json

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