dbgate-datalib 5.4.5-alpha.5 → 5.5.1

package/lib/GridDisplay.d.ts

@@ -111,7 +111,7 @@ export declare abstract class GridDisplay {
     getChangeSetRow(row: any, insertedRowIndex: any, existingRowIndex: any, baseNameOmitable?: boolean): ChangeSetRowDefinition;
     createSelect(options?: {}): Select;
     processReferences(select: Select, displayedColumnInfo: DisplayedColumnInfo, options: any): void;
-    createColumnExpression(col: any, source: any, alias?: any): any;
+    createColumnExpression(col: any, source: any, alias?: any, purpose?: 'view' | 'filter'): any;
     createSelectBase(name: NamedObjectInfo, columns: ColumnInfo[], options: any, defaultOrderColumnName?: string): Select;
     getRowNumberOverSelect(select: Select, offset: number, count: number): Select;
     getPageQuery(offset: number, count: number): Select;

package/lib/GridDisplay.js

@@ -135,7 +135,7 @@ class GridDisplay {
                 if (condition) {
                     conditions.push(lodash_1.default.cloneDeepWith(condition, (expr) => {
                         if (expr.exprType == 'placeholder') {
-                            return this.createColumnExpression(column, { alias: column.sourceAlias });
+                            return this.createColumnExpression(column, { alias: column.sourceAlias }, undefined, 'filter');
                         }
                         // return {
                         //   exprType: 'column',
@@ -161,7 +161,7 @@ class GridDisplay {
                     if (condition) {
                         orCondition.conditions.push(lodash_1.default.cloneDeepWith(condition, (expr) => {
                             if (expr.exprType == 'placeholder') {
-                                return this.createColumnExpression(column, { alias: 'basetbl' });
+                                return this.createColumnExpression(column, { alias: 'basetbl' }, undefined, 'filter');
                             }
                         }));
                     }
@@ -397,10 +397,10 @@ class GridDisplay {
         return null;
     }
     processReferences(select, displayedColumnInfo, options) { }
-    createColumnExpression(col, source, alias) {
+    createColumnExpression(col, source, alias, purpose = 'view') {
         let expr = null;
         if (this.dialect.createColumnViewExpression) {
-            expr = this.dialect.createColumnViewExpression(col.columnName, col.dataType, source, alias);
+            expr = this.dialect.createColumnViewExpression(col.columnName, col.dataType, source, alias, purpose);
             if (expr) {
                 return expr;
             }
@@ -418,7 +418,7 @@ class GridDisplay {
                 name: lodash_1.default.pick(name, ['schemaName', 'pureName']),
                 alias: 'basetbl',
             },
-            columns: columns.map(col => this.createColumnExpression(col, { alias: 'basetbl' })),
+            columns: columns.map(col => this.createColumnExpression(col, { alias: 'basetbl' }, undefined, 'view')),
             orderBy: ((_b = this.driver) === null || _b === void 0 ? void 0 : _b.requiresDefaultSortCriteria)
                 ? [
                     {

package/lib/TableGridDisplay.js

@@ -205,7 +205,7 @@ class TableGridDisplay extends GridDisplay_1.GridDisplay {
     addAddedColumnsToSelect(select, columns, parentAlias, displayedColumnInfo) {
         for (const column of columns) {
             if (this.addAllExpandedColumnsToSelected || this.config.addedColumns.includes(column.uniqueName)) {
-                select.columns.push(this.createColumnExpression(column, { name: column, alias: parentAlias }, column.uniqueName));
+                select.columns.push(this.createColumnExpression(column, { name: column, alias: parentAlias }, column.uniqueName, 'view'));
                 displayedColumnInfo[column.uniqueName] = Object.assign(Object.assign({}, column), { sourceAlias: parentAlias });
             }
         }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.4.5-alpha.5",
+  "version": "5.5.1",
   "name": "dbgate-datalib",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -13,12 +13,12 @@
     "lib"
   ],
   "dependencies": {
-    "dbgate-sqltree": "^5.4.5-alpha.5",
-    "dbgate-tools": "^5.4.5-alpha.5",
-    "dbgate-filterparser": "^5.4.5-alpha.5"
+    "dbgate-sqltree": "^5.5.1",
+    "dbgate-tools": "^5.5.1",
+    "dbgate-filterparser": "^5.5.1"
   },
   "devDependencies": {
-    "dbgate-types": "^5.4.5-alpha.5",
+    "dbgate-types": "^5.5.1",
     "@types/node": "^13.7.0",
     "jest": "^28.1.3",
     "ts-jest": "^28.0.7",