dbgate-datalib 5.0.2 → 5.0.4-alpha.7

package/lib/ChangeSet.js

@@ -183,27 +183,40 @@ function changeSetInsertToSql(item, dbinfo = null) {
     ];
 }
 function extractChangeSetCondition(item, alias) {
-    return {
-        conditionType: 'and',
-        conditions: lodash_1.default.keys(item.condition).map(columnName => ({
-            conditionType: 'binary',
-            operator: '=',
-            left: {
-                exprType: 'column',
-                columnName,
-                source: {
-                    name: {
-                        pureName: item.pureName,
-                        schemaName: item.schemaName,
-                    },
-                    alias,
+    function getColumnCondition(columnName) {
+        const value = item.condition[columnName];
+        const expr = {
+            exprType: 'column',
+            columnName,
+            source: {
+                name: {
+                    pureName: item.pureName,
+                    schemaName: item.schemaName,
                 },
+                alias,
             },
-            right: {
-                exprType: 'value',
-                value: item.condition[columnName],
-            },
-        })),
+        };
+        if (value == null) {
+            return {
+                conditionType: 'isNull',
+                expr,
+            };
+        }
+        else {
+            return {
+                conditionType: 'binary',
+                operator: '=',
+                left: expr,
+                right: {
+                    exprType: 'value',
+                    value,
+                },
+            };
+        }
+    }
+    return {
+        conditionType: 'and',
+        conditions: lodash_1.default.keys(item.condition).map(columnName => getColumnCondition(columnName)),
     };
 }
 exports.extractChangeSetCondition = extractChangeSetCondition;

package/lib/GridDisplay.d.ts

@@ -85,10 +85,14 @@ export declare abstract class GridDisplay {
     removeFilter(uniqueName: any): void;
     setFilters(dct: any): void;
     setSort(uniqueName: any, order: any): void;
+    addToSort(uniqueName: any, order: any): void;
+    clearSort(): void;
     setGrouping(uniqueName: any, groupFunc: GroupFunc): void;
     getGrouping(uniqueName: any): GroupFunc;
     clearGrouping(): void;
     getSortOrder(uniqueName: any): "ASC" | "DESC";
+    getSortOrderIndex(uniqueName: any): number;
+    isSortDefined(): boolean;
     get filterCount(): number;
     clearFilters(): void;
     getChangeSetCondition(row: any): Pick<any, string>;
@@ -96,6 +100,7 @@ export declare abstract class GridDisplay {
     getChangeSetRow(row: any, insertedRowIndex: any): ChangeSetRowDefinition;
     createSelect(options?: {}): Select;
     processReferences(select: Select, displayedColumnInfo: DisplayedColumnInfo, options: any): void;
+    createColumnExpression(col: any, source: any, alias?: any): any;
     createSelectBase(name: NamedObjectInfo, columns: ColumnInfo[], options: any): Select;
     getRowNumberOverSelect(select: Select, offset: number, count: number): Select;
     getPageQuery(offset: number, count: number): Select;

package/lib/GridDisplay.js

@@ -257,6 +257,14 @@ class GridDisplay {
         this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { sort: [{ uniqueName, order }] })));
         this.reload();
     }
+    addToSort(uniqueName, order) {
+        this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { sort: [...(cfg.sort || []), { uniqueName, order }] })));
+        this.reload();
+    }
+    clearSort() {
+        this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { sort: [] })));
+        this.reload();
+    }
     setGrouping(uniqueName, groupFunc) {
         this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { grouping: groupFunc
                 ? Object.assign(Object.assign({}, cfg.grouping), { [uniqueName]: groupFunc }) : lodash_1.default.omitBy(cfg.grouping, (v, k) => k == uniqueName) })));
@@ -284,6 +292,14 @@ class GridDisplay {
         var _a;
         return (_a = this.config.sort.find(x => x.uniqueName == uniqueName)) === null || _a === void 0 ? void 0 : _a.order;
     }
+    getSortOrderIndex(uniqueName) {
+        if (this.config.sort.length <= 1)
+            return -1;
+        return lodash_1.default.findIndex(this.config.sort, x => x.uniqueName == uniqueName);
+    }
+    isSortDefined() {
+        return (this.config.sort || []).length > 0;
+    }
     get filterCount() {
         return lodash_1.default.compact(lodash_1.default.values(this.config.filters)).length;
     }
@@ -323,6 +339,16 @@ class GridDisplay {
         return null;
     }
     processReferences(select, displayedColumnInfo, options) { }
+    createColumnExpression(col, source, alias) {
+        let expr = null;
+        if (this.dialect.createColumnViewExpression) {
+            expr = this.dialect.createColumnViewExpression(col.columnName, col.dataType, source, alias);
+            if (expr) {
+                return expr;
+            }
+        }
+        return Object.assign({ exprType: 'column', alias: alias || col.columnName, source }, col);
+    }
     createSelectBase(name, columns, options) {
         if (!columns)
             return null;
@@ -333,7 +359,7 @@ class GridDisplay {
                 name: lodash_1.default.pick(name, ['schemaName', 'pureName']),
                 alias: 'basetbl',
             },
-            columns: columns.map(col => (Object.assign({ exprType: 'column', alias: col.columnName, source: { alias: 'basetbl' } }, col))),
+            columns: columns.map(col => this.createColumnExpression(col, { alias: 'basetbl' })),
             orderBy: [
                 {
                     exprType: 'column',

package/lib/TableGridDisplay.js

@@ -188,12 +188,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({
-                    exprType: 'column',
-                    columnName: column.columnName,
-                    alias: column.uniqueName,
-                    source: { name: column, alias: parentAlias },
-                });
+                select.columns.push(this.createColumnExpression(column, { name: column, alias: parentAlias }, column.uniqueName));
                 displayedColumnInfo[column.uniqueName] = Object.assign(Object.assign({}, column), { sourceAlias: parentAlias });
             }
         }

package/package.json

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