dbgate-datalib 5.3.4 → 5.4.0

package/lib/ChangeSet.d.ts

@@ -13,6 +13,9 @@ export interface ChangeSetItem {
     fields?: {
         [column: string]: string;
     };
+    insertIfNotExistsFields?: {
+        [column: string]: string;
+    };
 }
 export interface ChangeSetItemFields {
     inserts: ChangeSetItem[];
@@ -48,5 +51,6 @@ export declare function revertChangeSetRowChanges(changeSet: ChangeSet, definiti
 export declare function deleteChangeSetRows(changeSet: ChangeSet, definition: ChangeSetRowDefinition): ChangeSet;
 export declare function getChangeSetInsertedRows(changeSet: ChangeSet, name?: NamedObjectInfo): any[];
 export declare function changeSetInsertNewRow(changeSet: ChangeSet, name?: NamedObjectInfo): ChangeSet;
-export declare function changeSetInsertDocuments(changeSet: ChangeSet, documents: any[], name?: NamedObjectInfo): ChangeSet;
+export declare function changeSetInsertDocuments(changeSet: ChangeSet, documents: any[], name?: NamedObjectInfo, insertIfNotExistsFieldNames?: string[]): ChangeSet;
 export declare function changeSetContainsChanges(changeSet: ChangeSet): boolean;
+export declare function changeSetChangedCount(changeSet: ChangeSet): number;

package/lib/ChangeSet.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.changeSetContainsChanges = exports.changeSetInsertDocuments = exports.changeSetInsertNewRow = exports.getChangeSetInsertedRows = exports.deleteChangeSetRows = exports.revertChangeSetRowChanges = exports.changeSetToSql = exports.extractChangeSetCondition = exports.batchUpdateChangeSet = exports.setChangeSetRowData = exports.setChangeSetValue = exports.findExistingChangeSetItem = exports.createChangeSet = void 0;
+exports.changeSetChangedCount = exports.changeSetContainsChanges = exports.changeSetInsertDocuments = exports.changeSetInsertNewRow = exports.getChangeSetInsertedRows = exports.deleteChangeSetRows = exports.revertChangeSetRowChanges = exports.changeSetToSql = exports.extractChangeSetCondition = exports.batchUpdateChangeSet = exports.setChangeSetRowData = exports.setChangeSetValue = exports.findExistingChangeSetItem = exports.createChangeSet = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 function createChangeSet() {
     return {
@@ -136,28 +136,33 @@ function batchUpdateChangeSet(changeSet, rowDefinitions, dataRows) {
     return changeSet;
 }
 exports.batchUpdateChangeSet = batchUpdateChangeSet;
-function extractFields(item, allowNulls = true) {
-    return lodash_1.default.keys(item.fields)
-        .filter(targetColumn => allowNulls || item.fields[targetColumn] != null)
+function extractFields(item, allowNulls = true, allowedDocumentColumns = []) {
+    const allFields = Object.assign({}, item.fields);
+    for (const docField in item.document || {}) {
+        if (allowedDocumentColumns.includes(docField)) {
+            allFields[docField] = item.document[docField];
+        }
+    }
+    return lodash_1.default.keys(allFields)
+        .filter(targetColumn => allowNulls || allFields[targetColumn] != null)
         .map(targetColumn => ({
         targetColumn,
         exprType: 'value',
-        value: item.fields[targetColumn],
+        value: allFields[targetColumn],
     }));
 }
 function changeSetInsertToSql(item, dbinfo = null) {
-    const fields = extractFields(item, false);
+    var _a, _b;
+    const table = (_a = dbinfo === null || dbinfo === void 0 ? void 0 : dbinfo.tables) === null || _a === void 0 ? void 0 : _a.find(x => x.schemaName == item.schemaName && x.pureName == item.pureName);
+    const fields = extractFields(item, false, (_b = table === null || table === void 0 ? void 0 : table.columns) === null || _b === void 0 ? void 0 : _b.map(x => x.columnName));
     if (fields.length == 0)
         return null;
     let autoInc = false;
-    if (dbinfo) {
-        const table = dbinfo.tables.find(x => x.schemaName == item.schemaName && x.pureName == item.pureName);
-        if (table) {
-            const autoIncCol = table.columns.find(x => x.autoIncrement);
-            // console.log('autoIncCol', autoIncCol);
-            if (autoIncCol && fields.find(x => x.targetColumn == autoIncCol.columnName)) {
-                autoInc = true;
-            }
+    if (table) {
+        const autoIncCol = table.columns.find(x => x.autoIncrement);
+        // console.log('autoIncCol', autoIncCol);
+        if (autoIncCol && fields.find(x => x.targetColumn == autoIncCol.columnName)) {
+            autoInc = true;
         }
     }
     const targetTable = {
@@ -176,6 +181,9 @@ function changeSetInsertToSql(item, dbinfo = null) {
             targetTable,
             commandType: 'insert',
             fields,
+            insertWhereNotExistsCondition: item.insertIfNotExistsFields
+                ? compileSimpleChangeSetCondition(item.insertIfNotExistsFields)
+                : null,
         },
         autoInc
             ? {
@@ -224,7 +232,40 @@ function extractChangeSetCondition(item, alias) {
     };
 }
 exports.extractChangeSetCondition = extractChangeSetCondition;
-function changeSetUpdateToSql(item) {
+function compileSimpleChangeSetCondition(fields) {
+    function getColumnCondition(columnName) {
+        const value = fields[columnName];
+        const expr = {
+            exprType: 'column',
+            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(fields).map(columnName => getColumnCondition(columnName)),
+    };
+}
+function changeSetUpdateToSql(item, dbinfo = null) {
+    var _a, _b, _c;
+    const table = (_a = dbinfo === null || dbinfo === void 0 ? void 0 : dbinfo.tables) === null || _a === void 0 ? void 0 : _a.find(x => x.schemaName == item.schemaName && x.pureName == item.pureName);
+    const autoIncCol = (_b = table === null || table === void 0 ? void 0 : table.columns) === null || _b === void 0 ? void 0 : _b.find(x => x.autoIncrement);
     return {
         from: {
             name: {
@@ -233,7 +274,7 @@ function changeSetUpdateToSql(item) {
             },
         },
         commandType: 'update',
-        fields: extractFields(item),
+        fields: extractFields(item, true, (_c = table === null || table === void 0 ? void 0 : table.columns) === null || _c === void 0 ? void 0 : _c.map(x => x.columnName).filter(x => x != (autoIncCol === null || autoIncCol === void 0 ? void 0 : autoIncCol.columnName))),
         where: extractChangeSetCondition(item),
     };
 }
@@ -252,7 +293,7 @@ function changeSetDeleteToSql(item) {
 function changeSetToSql(changeSet, dbinfo) {
     return lodash_1.default.compact(lodash_1.default.flatten([
         ...changeSet.inserts.map(item => changeSetInsertToSql(item, dbinfo)),
-        ...changeSet.updates.map(changeSetUpdateToSql),
+        ...changeSet.updates.map(item => changeSetUpdateToSql(item, dbinfo)),
         ...changeSet.deletes.map(changeSetDeleteToSql),
     ]));
 }
@@ -327,11 +368,11 @@ function changeSetInsertNewRow(changeSet, name) {
         ] });
 }
 exports.changeSetInsertNewRow = changeSetInsertNewRow;
-function changeSetInsertDocuments(changeSet, documents, name) {
+function changeSetInsertDocuments(changeSet, documents, name, insertIfNotExistsFieldNames) {
     const insertedRows = getChangeSetInsertedRows(changeSet, name);
     return Object.assign(Object.assign({}, changeSet), { inserts: [
             ...changeSet.inserts,
-            ...documents.map((doc, index) => (Object.assign(Object.assign({}, name), { insertedRowIndex: insertedRows.length + index, fields: doc }))),
+            ...documents.map((doc, index) => (Object.assign(Object.assign({}, name), { insertedRowIndex: insertedRows.length + index, fields: doc, insertIfNotExistsFields: insertIfNotExistsFieldNames ? lodash_1.default.pick(doc, insertIfNotExistsFieldNames) : null }))),
         ] });
 }
 exports.changeSetInsertDocuments = changeSetInsertDocuments;
@@ -347,3 +388,7 @@ function changeSetContainsChanges(changeSet) {
         ((_a = changeSet.dataUpdateCommands) === null || _a === void 0 ? void 0 : _a.length) > 0);
 }
 exports.changeSetContainsChanges = changeSetContainsChanges;
+function changeSetChangedCount(changeSet) {
+    return changeSet.deletes.length + changeSet.updates.length + changeSet.inserts.length;
+}
+exports.changeSetChangedCount = changeSetChangedCount;

package/lib/CollectionGridDisplay.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CollectionGridDisplay = exports.analyseCollectionDisplayColumns = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const GridDisplay_1 = require("./GridDisplay");
+const dbgate_tools_1 = require("dbgate-tools");
 function getObjectKeys(obj) {
     if (lodash_1.default.isArray(obj)) {
         return Object.keys(obj)
@@ -58,7 +59,7 @@ function getColumnsForObject(basePath, obj, res, display) {
     }
 }
 function getDisplayColumn(basePath, columnName, display) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const uniquePath = [...basePath, columnName];
     const uniqueName = uniquePath.join('.');
     return {
@@ -68,9 +69,12 @@ function getDisplayColumn(basePath, columnName, display) {
         uniquePath,
         isStructured: true,
         parentHeaderText: createHeaderText(basePath),
-        filterType: 'mongo',
-        pureName: (_a = display.collection) === null || _a === void 0 ? void 0 : _a.pureName,
-        schemaName: (_b = display.collection) === null || _b === void 0 ? void 0 : _b.schemaName,
+        filterBehaviour: (_b = (_a = display === null || display === void 0 ? void 0 : display.driver) === null || _a === void 0 ? void 0 : _a.getFilterBehaviour(null, dbgate_tools_1.standardFilterBehaviours)) !== null && _b !== void 0 ? _b : dbgate_tools_1.mongoFilterBehaviour,
+        pureName: (_c = display.collection) === null || _c === void 0 ? void 0 : _c.pureName,
+        schemaName: (_d = display.collection) === null || _d === void 0 ? void 0 : _d.schemaName,
+        isPartitionKey: !!((_f = (_e = display === null || display === void 0 ? void 0 : display.collection) === null || _e === void 0 ? void 0 : _e.partitionKey) === null || _f === void 0 ? void 0 : _f.find(x => x.columnName == uniqueName)),
+        isClusterKey: !!((_h = (_g = display === null || display === void 0 ? void 0 : display.collection) === null || _g === void 0 ? void 0 : _g.clusterKey) === null || _h === void 0 ? void 0 : _h.find(x => x.columnName == uniqueName)),
+        isUniqueKey: !!((_k = (_j = display === null || display === void 0 ? void 0 : display.collection) === null || _j === void 0 ? void 0 : _j.uniqueKey) === null || _k === void 0 ? void 0 : _k.find(x => x.columnName == uniqueName)),
     };
 }
 function analyseCollectionDisplayColumns(rows, display) {
@@ -90,6 +94,7 @@ function analyseCollectionDisplayColumns(rows, display) {
 exports.analyseCollectionDisplayColumns = analyseCollectionDisplayColumns;
 class CollectionGridDisplay extends GridDisplay_1.GridDisplay {
     constructor(collection, driver, config, setConfig, cache, setCache, loadedRows, changeSet, readOnly = false) {
+        var _a, _b;
         super(config, setConfig, cache, setCache, driver);
         this.collection = collection;
         const changedDocs = lodash_1.default.compact(changeSet.updates.map(chs => chs.document));
@@ -97,10 +102,10 @@ class CollectionGridDisplay extends GridDisplay_1.GridDisplay {
         this.columns = analyseCollectionDisplayColumns([...(loadedRows || []), ...changedDocs, ...insertedDocs], this);
         this.filterable = true;
         this.sortable = true;
-        this.editable = !readOnly;
+        this.editable = !readOnly && ((_a = collection === null || collection === void 0 ? void 0 : collection.uniqueKey) === null || _a === void 0 ? void 0 : _a.length) > 0;
         this.supportsReload = true;
         this.isDynamicStructure = true;
-        this.changeSetKeyFields = ['_id'];
+        this.changeSetKeyFields = (_b = collection === null || collection === void 0 ? void 0 : collection.uniqueKey) === null || _b === void 0 ? void 0 : _b.map(x => x.columnName);
         this.baseCollection = collection;
     }
 }

package/lib/CustomGridDisplay.d.ts

@@ -0,0 +1,16 @@
+import { GridDisplay, ChangeCacheFunc, ChangeConfigFunc } from './GridDisplay';
+import type { EngineDriver, NamedObjectInfo, DatabaseInfo } from 'dbgate-types';
+import { GridConfig, GridCache } from './GridConfig';
+import { Select, Condition } from 'dbgate-sqltree';
+export interface CustomGridColumn {
+    columnName: string;
+    columnLabel: string;
+    isPrimaryKey?: boolean;
+}
+export declare class CustomGridDisplay extends GridDisplay {
+    tableName: NamedObjectInfo;
+    additionalcondition: Condition;
+    customColumns: CustomGridColumn[];
+    constructor(tableName: NamedObjectInfo, columns: CustomGridColumn[], driver: EngineDriver, config: GridConfig, setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, dbinfo: DatabaseInfo, serverVersion: any, isReadOnly?: boolean, additionalcondition?: Condition);
+    createSelect(options?: {}): Select;
+}

package/lib/CustomGridDisplay.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CustomGridDisplay = void 0;
+const GridDisplay_1 = require("./GridDisplay");
+class CustomGridDisplay extends GridDisplay_1.GridDisplay {
+    constructor(tableName, columns, driver, config, setConfig, cache, setCache, dbinfo, serverVersion, isReadOnly = false, additionalcondition = null) {
+        super(config, setConfig, cache, setCache, driver, dbinfo, serverVersion);
+        this.tableName = tableName;
+        this.additionalcondition = additionalcondition;
+        this.customColumns = columns;
+        this.columns = columns.map(col => ({
+            columnName: col.columnName,
+            headerText: col.columnLabel,
+            uniqueName: col.columnName,
+            uniquePath: [col.columnName],
+            isPrimaryKey: col.isPrimaryKey,
+            isForeignKeyUnique: false,
+            schemaName: tableName.schemaName,
+            pureName: tableName.pureName,
+        }));
+        this.changeSetKeyFields = columns.filter(x => x.isPrimaryKey).map(x => x.columnName);
+        this.baseTable = Object.assign(Object.assign({}, tableName), { columns: this.columns.map(x => (Object.assign(Object.assign({}, tableName), { columnName: x.columnName, dataType: 'string' }))), foreignKeys: [] });
+        this.filterable = true;
+        this.sortable = true;
+        this.groupable = false;
+        this.editable = !isReadOnly;
+        this.supportsReload = true;
+    }
+    createSelect(options = {}) {
+        var _a;
+        const select = this.createSelectBase(this.tableName, [], 
+        // @ts-ignore
+        // this.columns.map(col => ({
+        //   columnName: col.columnName,
+        // })),
+        options, (_a = this.customColumns.find(x => x.isPrimaryKey)) === null || _a === void 0 ? void 0 : _a.columnName);
+        select.selectAll = true;
+        if (this.additionalcondition) {
+            if (select.where) {
+                select.where = {
+                    conditionType: 'and',
+                    conditions: [select.where, this.additionalcondition],
+                };
+            }
+            else {
+                select.where = this.additionalcondition;
+            }
+        }
+        return select;
+    }
+}
+exports.CustomGridDisplay = CustomGridDisplay;

package/lib/GridDisplay.d.ts

@@ -1,5 +1,5 @@
 import { GridConfig, GridCache, GridConfigColumns, GroupFunc } from './GridConfig';
-import type { ForeignKeyInfo, TableInfo, ColumnInfo, EngineDriver, NamedObjectInfo, DatabaseInfo, CollectionInfo, SqlDialect, ViewInfo } from 'dbgate-types';
+import type { ForeignKeyInfo, TableInfo, ColumnInfo, EngineDriver, NamedObjectInfo, DatabaseInfo, CollectionInfo, SqlDialect, ViewInfo, FilterBehaviour } from 'dbgate-types';
 import { ChangeSetFieldDefinition, ChangeSetRowDefinition } from './ChangeSet';
 import { Select, Condition } from 'dbgate-sqltree';
 export interface DisplayColumn {
@@ -12,13 +12,16 @@ export interface DisplayColumn {
     notNull?: boolean;
     autoIncrement?: boolean;
     isPrimaryKey?: boolean;
+    isPartitionKey?: boolean;
+    isClusterKey?: boolean;
+    isUniqueKey?: boolean;
     foreignKey?: ForeignKeyInfo;
     isForeignKeyUnique?: boolean;
     isExpandable?: boolean;
     isChecked?: boolean;
     hintColumnNames?: string[];
     dataType?: string;
-    filterType?: boolean;
+    filterBehaviour?: FilterBehaviour;
     isStructured?: boolean;
 }
 export interface DisplayedColumnEx extends DisplayColumn {
@@ -56,7 +59,7 @@ export declare abstract class GridDisplay {
     isLoadedCorrectly: boolean;
     supportsReload: boolean;
     isDynamicStructure: boolean;
-    filterTypeOverride: any;
+    filterBehaviourOverride: any;
     setColumnVisibility(uniquePath: string[], isVisible: boolean): void;
     addDynamicColumn(name: string): void;
     focusColumns(uniqueNames: string[]): void;
@@ -67,7 +70,11 @@ export declare abstract class GridDisplay {
     findColumn(uniqueName: string): DisplayColumn;
     getFkTarget(column: DisplayColumn): TableInfo;
     reload(): void;
-    includeInColumnSet(field: keyof GridConfigColumns, uniqueName: string, isIncluded: boolean): void;
+    includeInColumnSet(modifications: ({
+        field: keyof GridConfigColumns;
+        uniqueName: string;
+        isIncluded: boolean;
+    } | null)[]): void;
     showAllColumns(): void;
     hideAllColumns(): void;
     get hiddenColumnIndexes(): number[];
@@ -105,7 +112,7 @@ export declare abstract class GridDisplay {
     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;
+    createSelectBase(name: NamedObjectInfo, columns: ColumnInfo[], options: any, defaultOrderColumnName?: string): Select;
     getRowNumberOverSelect(select: Select, offset: number, count: number): Select;
     getPageQuery(offset: number, count: number): Select;
     getExportQuery(postprocessSelect?: any): string;

package/lib/GridDisplay.js

@@ -29,7 +29,7 @@ class GridDisplay {
         this.isLoadedCorrectly = true;
         this.supportsReload = false;
         this.isDynamicStructure = false;
-        this.filterTypeOverride = null;
+        this.filterBehaviourOverride = 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() {
@@ -44,16 +44,22 @@ class GridDisplay {
     setColumnVisibility(uniquePath, isVisible) {
         const uniqueName = uniquePath.join('.');
         if (uniquePath.length == 1) {
-            this.includeInColumnSet('hiddenColumns', uniqueName, !isVisible);
+            this.includeInColumnSet([
+                { field: 'hiddenColumns', uniqueName, isIncluded: !isVisible },
+                isVisible == false && this.isDynamicStructure && { field: 'addedColumns', uniqueName, isIncluded: false },
+            ]);
         }
         else {
-            this.includeInColumnSet('addedColumns', uniqueName, isVisible);
+            this.includeInColumnSet([{ field: 'addedColumns', uniqueName, isIncluded: isVisible }]);
             if (!this.isDynamicStructure)
                 this.reload();
         }
     }
     addDynamicColumn(name) {
-        this.includeInColumnSet('addedColumns', name, true);
+        this.includeInColumnSet([
+            { field: 'addedColumns', uniqueName: name, isIncluded: true },
+            { field: 'hiddenColumns', uniqueName: name, isIncluded: false },
+        ]);
     }
     focusColumns(uniqueNames) {
         this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { focusedColumns: uniqueNames })));
@@ -80,14 +86,23 @@ class GridDisplay {
     reload() {
         this.setCache(reloadDataCacheFunc);
     }
-    includeInColumnSet(field, uniqueName, isIncluded) {
-        // console.log('includeInColumnSet', field, uniqueName, isIncluded);
-        if (isIncluded) {
-            this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { [field]: [...(cfg[field] || []), uniqueName] })));
-        }
-        else {
-            this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { [field]: (cfg[field] || []).filter(x => x != uniqueName) })));
-        }
+    includeInColumnSet(modifications) {
+        this.setConfig(cfg => {
+            let res = cfg;
+            for (const modification of modifications) {
+                if (!modification) {
+                    continue;
+                }
+                const { field, uniqueName, isIncluded } = modification;
+                if (isIncluded) {
+                    res = Object.assign(Object.assign({}, res), { [field]: [...(cfg[field] || []), uniqueName] });
+                }
+                else {
+                    res = Object.assign(Object.assign({}, res), { [field]: (cfg[field] || []).filter(x => x != uniqueName) });
+                }
+            }
+            return res;
+        });
     }
     showAllColumns() {
         this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { hiddenColumns: [] })));
@@ -106,6 +121,7 @@ class GridDisplay {
             : this.config.addedColumns.includes(column.uniqueName);
     }
     applyFilterOnSelect(select, displayedColumnInfo) {
+        var _a, _b;
         const conditions = [];
         for (const uniqueName in this.config.filters) {
             const filter = this.config.filters[uniqueName];
@@ -115,7 +131,7 @@ class GridDisplay {
             if (!column)
                 continue;
             try {
-                const condition = (0, dbgate_filterparser_1.parseFilter)(filter, (0, dbgate_filterparser_1.getFilterType)(column.dataType));
+                const condition = (0, dbgate_filterparser_1.parseFilter)(filter, (_b = (_a = this.driver) === null || _a === void 0 ? void 0 : _a.getFilterBehaviour(column.dataType, dbgate_tools_2.standardFilterBehaviours)) !== null && _b !== void 0 ? _b : (0, dbgate_tools_2.detectSqlFilterBehaviour)(column.dataType));
                 if (condition) {
                     conditions.push(lodash_1.default.cloneDeepWith(condition, (expr) => {
                         if (expr.exprType == 'placeholder') {
@@ -141,7 +157,7 @@ class GridDisplay {
             };
             for (const column of this.baseTableOrView.columns) {
                 try {
-                    const condition = (0, dbgate_filterparser_1.parseFilter)(this.config.multiColumnFilter, (0, dbgate_filterparser_1.getFilterType)(column.dataType));
+                    const condition = (0, dbgate_filterparser_1.parseFilter)(this.config.multiColumnFilter, (0, dbgate_tools_2.detectSqlFilterBehaviour)(column.dataType));
                     if (condition) {
                         orCondition.conditions.push(lodash_1.default.cloneDeepWith(condition, (expr) => {
                             if (expr.exprType == 'placeholder') {
@@ -258,7 +274,9 @@ class GridDisplay {
         return this.config.expandedColumns.includes(uniqueName);
     }
     toggleExpandedColumn(uniqueName, value) {
-        this.includeInColumnSet('expandedColumns', uniqueName, value == null ? !this.isExpandedColumn(uniqueName) : value);
+        this.includeInColumnSet([
+            { field: 'expandedColumns', uniqueName, isIncluded: value == null ? !this.isExpandedColumn(uniqueName) : value },
+        ]);
     }
     getFilter(uniqueName) {
         return this.config.filters[uniqueName];
@@ -389,11 +407,11 @@ class GridDisplay {
         }
         return Object.assign({ exprType: 'column', alias: alias || col.columnName, source }, col);
     }
-    createSelectBase(name, columns, options) {
-        var _a;
+    createSelectBase(name, columns, options, defaultOrderColumnName) {
+        var _a, _b;
         if (!columns)
             return null;
-        const orderColumnName = columns[0].columnName;
+        const orderColumnName = defaultOrderColumnName !== null && defaultOrderColumnName !== void 0 ? defaultOrderColumnName : (_a = columns[0]) === null || _a === void 0 ? void 0 : _a.columnName;
         const select = {
             commandType: 'select',
             from: {
@@ -401,7 +419,7 @@ class GridDisplay {
                 alias: 'basetbl',
             },
             columns: columns.map(col => this.createColumnExpression(col, { alias: 'basetbl' })),
-            orderBy: ((_a = this.driver) === null || _a === void 0 ? void 0 : _a.requiresDefaultSortCriteria)
+            orderBy: ((_b = this.driver) === null || _b === void 0 ? void 0 : _b.requiresDefaultSortCriteria)
                 ? [
                     {
                         exprType: 'column',
@@ -554,13 +572,14 @@ class GridDisplay {
                     alias: 'count',
                 },
             ];
+            select.selectAll = false;
         }
         return select;
         // const sql = treeToSql(this.driver, select, dumpSqlSelect);
         // return sql;
     }
     compileJslFilters() {
-        var _a;
+        var _a, _b, _c;
         const filters = this.config && this.config.filters;
         if (!filters)
             return null;
@@ -569,9 +588,9 @@ class GridDisplay {
             const column = this.isDynamicStructure ? null : this.columns.find(x => x.columnName == name);
             if (!this.isDynamicStructure && !column)
                 continue;
-            const filterType = (_a = this.filterTypeOverride) !== null && _a !== void 0 ? _a : (this.isDynamicStructure ? 'mongo' : (0, dbgate_filterparser_1.getFilterType)(column.dataType));
+            const filterBehaviour = (_c = (_a = this.filterBehaviourOverride) !== null && _a !== void 0 ? _a : (_b = this.driver) === null || _b === void 0 ? void 0 : _b.getFilterBehaviour(column.dataType, dbgate_tools_2.standardFilterBehaviours)) !== null && _c !== void 0 ? _c : (0, dbgate_tools_2.detectSqlFilterBehaviour)(column.dataType);
             try {
-                const condition = (0, dbgate_filterparser_1.parseFilter)(filters[name], filterType);
+                const condition = (0, dbgate_filterparser_1.parseFilter)(filters[name], filterBehaviour);
                 const replaced = lodash_1.default.cloneDeepWith(condition, (expr) => {
                     if (expr.exprType == 'placeholder')
                         return {
@@ -586,7 +605,7 @@ class GridDisplay {
             }
         }
         if (this.config.multiColumnFilter) {
-            const placeholderCondition = (0, dbgate_filterparser_1.parseFilter)(this.config.multiColumnFilter, 'string');
+            const placeholderCondition = (0, dbgate_filterparser_1.parseFilter)(this.config.multiColumnFilter, dbgate_tools_2.stringFilterBehaviour);
             if (placeholderCondition) {
                 conditions.push({
                     conditionType: 'anyColumnPass',

package/lib/JslGridDisplay.js

@@ -7,6 +7,7 @@ exports.JslGridDisplay = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const GridDisplay_1 = require("./GridDisplay");
 const CollectionGridDisplay_1 = require("./CollectionGridDisplay");
+const dbgate_tools_1 = require("dbgate-tools");
 class JslGridDisplay extends GridDisplay_1.GridDisplay {
     constructor(jslid, structure, config, setConfig, cache, setCache, rows, isDynamicStructure, supportsReload, editable = false) {
         var _a;
@@ -15,7 +16,7 @@ class JslGridDisplay extends GridDisplay_1.GridDisplay {
         this.sortable = true;
         this.supportsReload = supportsReload;
         this.isDynamicStructure = isDynamicStructure;
-        this.filterTypeOverride = 'eval';
+        this.filterBehaviourOverride = dbgate_tools_1.evalFilterBehaviour;
         this.editable = editable;
         this.editableStructure = editable ? structure : null;
         if (structure === null || structure === void 0 ? void 0 : structure.columns) {

package/lib/PerspectiveCache.js

@@ -88,7 +88,6 @@ class PerspectiveCache {
             'databaseConfig',
             'orderBy',
             'sqlCondition',
-            'mongoCondition',
         ]));
         let res = this.tables[tableKey];
         if (res && (0, difference_1.default)(props.dataColumns, res.dataColumns).length > 0 && !res.allColumns) {

package/lib/PerspectiveConfig.d.ts

@@ -1,4 +1,4 @@
-import type { DatabaseInfo, ForeignKeyInfo } from 'dbgate-types';
+import type { DatabaseInfo, FilterBehaviour, ForeignKeyInfo } from 'dbgate-types';
 export type PerspectiveDatabaseEngineType = 'sqldb' | 'docdb';
 export interface PerspectiveDatabaseConfig {
     conid: string;
@@ -20,7 +20,7 @@ export interface PerspectiveCustomJoinConfig {
 }
 export interface PerspectiveFilterColumnInfo {
     columnName: string;
-    filterType: string;
+    filterBehaviour: FilterBehaviour;
     pureName: string;
     schemaName: string;
     foreignKey: ForeignKeyInfo;

package/lib/PerspectiveDataLoader.d.ts

@@ -4,7 +4,6 @@ export declare class PerspectiveDataLoader {
     apiCall: any;
     constructor(apiCall: any);
     buildSqlCondition(props: PerspectiveDataLoadProps): Condition;
-    buildMongoCondition(props: PerspectiveDataLoadProps): {};
     loadGroupingSqlDb(props: PerspectiveDataLoadProps): Promise<any>;
     loadGroupingDocDb(props: PerspectiveDataLoadProps): Promise<any>;
     loadGrouping(props: PerspectiveDataLoadProps): Promise<any>;

package/lib/PerspectiveDataLoader.js

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PerspectiveDataLoader = void 0;
 const debug_1 = __importDefault(require("debug"));
-const zipObject_1 = __importDefault(require("lodash/zipObject"));
 const mapValues_1 = __importDefault(require("lodash/mapValues"));
 const isArray_1 = __importDefault(require("lodash/isArray"));
 const dbgate_tools_1 = require("dbgate-tools");
@@ -61,19 +60,6 @@ class PerspectiveDataLoader {
             }
             : null;
     }
-    buildMongoCondition(props) {
-        const { schemaName, pureName, bindingColumns, bindingValues, dataColumns, orderBy, mongoCondition } = props;
-        const conditions = [];
-        if (mongoCondition) {
-            conditions.push(mongoCondition);
-        }
-        if ((bindingColumns === null || bindingColumns === void 0 ? void 0 : bindingColumns.length) == 1) {
-            conditions.push({
-                [bindingColumns[0]]: { $in: bindingValues.map(x => x[0]) },
-            });
-        }
-        return conditions.length == 1 ? conditions[0] : conditions.length > 0 ? { $and: conditions } : null;
-    }
     loadGroupingSqlDb(props) {
         return __awaiter(this, void 0, void 0, function* () {
             const { schemaName, pureName, bindingColumns } = props;
@@ -122,15 +108,28 @@ class PerspectiveDataLoader {
     loadGroupingDocDb(props) {
         return __awaiter(this, void 0, void 0, function* () {
             const { schemaName, pureName, bindingColumns } = props;
-            const aggregate = [
-                { $match: this.buildMongoCondition(props) },
-                {
-                    $group: {
-                        _id: (0, zipObject_1.default)(bindingColumns, bindingColumns.map(col => '$' + col)),
-                        count: { $sum: 1 },
+            const aggregate = {
+                condition: this.buildSqlCondition(props),
+                groupByColumns: bindingColumns,
+                aggregateColumns: [
+                    {
+                        alias: 'pergrpsize',
+                        aggregateFunction: 'count',
                     },
-                },
-            ];
+                ],
+            };
+            // const aggregate = [
+            //   { $match: this.buildMongoCondition(props) },
+            //   {
+            //     $group: {
+            //       _id: _zipObject(
+            //         bindingColumns,
+            //         bindingColumns.map(col => '$' + col)
+            //       ),
+            //       count: { $sum: 1 },
+            //     },
+            //   },
+            // ];
             if (dbg === null || dbg === void 0 ? void 0 : dbg.enabled) {
                 dbg(`LOAD COUNTS, table=${props.pureName}, columns=${bindingColumns === null || bindingColumns === void 0 ? void 0 : bindingColumns.join(',')}`);
             }
@@ -144,7 +143,7 @@ class PerspectiveDataLoader {
             });
             if (response.errorMessage)
                 return response;
-            return response.rows.map(row => (Object.assign(Object.assign({}, row._id), { _perspective_group_size_: parseInt(row.count) })));
+            return response.rows.map(row => (Object.assign(Object.assign({}, row), { _perspective_group_size_: parseInt(row.pergrpsize) })));
         });
     }
     loadGrouping(props) {
@@ -209,13 +208,19 @@ class PerspectiveDataLoader {
         const { pureName } = props;
         const res = {
             pureName,
-            condition: this.buildMongoCondition(props),
-            skip: (_a = props.range) === null || _a === void 0 ? void 0 : _a.offset,
-            limit: (_b = props.range) === null || _b === void 0 ? void 0 : _b.limit,
+            condition: this.buildSqlCondition(props),
+            sort: useSort && ((_a = props.orderBy) === null || _a === void 0 ? void 0 : _a.length) > 0
+                ? props.orderBy.map(x => (Object.assign(Object.assign({}, x), { direction: x.order })))
+                : undefined,
+            skip: (_b = props.range) === null || _b === void 0 ? void 0 : _b.offset,
+            limit: (_c = props.range) === null || _c === void 0 ? void 0 : _c.limit,
         };
-        if (useSort && ((_c = props.orderBy) === null || _c === void 0 ? void 0 : _c.length) > 0) {
-            res.sort = (0, zipObject_1.default)(props.orderBy.map(col => col.columnName), props.orderBy.map(col => (col.order == 'DESC' ? -1 : 1)));
-        }
+        // if (useSort && props.orderBy?.length > 0) {
+        //   res.sort = _zipObject(
+        //     props.orderBy.map(col => col.columnName),
+        //     props.orderBy.map(col => (col.order == 'DESC' ? -1 : 1))
+        //   );
+        // }
         return res;
     }
     loadDataDocDb(props) {

package/lib/PerspectiveDataProvider.d.ts

@@ -20,7 +20,6 @@ export interface PerspectiveDataLoadProps {
     range?: RangeDefinition;
     topCount?: number;
     sqlCondition?: Condition;
-    mongoCondition?: any;
     engineType: PerspectiveDatabaseEngineType;
 }
 export declare class PerspectiveDataProvider {

package/lib/PerspectiveTreeNode.d.ts

@@ -1,7 +1,6 @@
-import type { CollectionInfo, ColumnInfo, DatabaseInfo, ForeignKeyInfo, NamedObjectInfo, TableInfo, ViewInfo } from 'dbgate-types';
+import type { CollectionInfo, ColumnInfo, DatabaseInfo, FilterBehaviour, ForeignKeyInfo, NamedObjectInfo, TableInfo, ViewInfo } from 'dbgate-types';
 import { ChangePerspectiveConfigFunc, MultipleDatabaseInfo, PerspectiveConfig, PerspectiveCustomJoinConfig, PerspectiveDatabaseConfig, PerspectiveDatabaseEngineType, PerspectiveFilterColumnInfo, PerspectiveNodeConfig, PerspectiveReferenceConfig } from './PerspectiveConfig';
 import { PerspectiveDataLoadProps, PerspectiveDataProvider } from './PerspectiveDataProvider';
-import { FilterType } from 'dbgate-filterparser/lib/types';
 import { Condition } from 'dbgate-sqltree';
 import { PerspectiveDataPatternColumn } from './PerspectiveDataPattern';
 export interface PerspectiveDataLoadPropsWithNode {
@@ -53,7 +52,7 @@ export declare abstract class PerspectiveTreeNode {
     get isSecondaryChecked(): boolean;
     get secondaryCheckable(): boolean;
     get columnTitle(): any;
-    get filterType(): FilterType;
+    get filterBehaviour(): FilterBehaviour;
     get columnName(): any;
     get customJoinConfig(): PerspectiveCustomJoinConfig;
     get db(): DatabaseInfo;
@@ -73,10 +72,10 @@ export declare abstract class PerspectiveTreeNode {
     includeInNodeSet(field: 'expandedColumns' | 'uncheckedColumns' | 'checkedColumns', isIncluded: boolean): void;
     getFilter(): string;
     getDataLoadColumns(): any[];
+    getMutliColumnCondition(source: any): Condition;
     getMutliColumnSqlCondition(source: any): Condition;
-    getMutliColumnMongoCondition(): {};
+    getMutliColumnNoSqlCondition(): Condition;
     getChildrenSqlCondition(source?: any): Condition;
-    getChildrenMongoCondition(source?: any): {};
     getOrderBy(table: TableInfo | ViewInfo | CollectionInfo): PerspectiveDataLoadProps['orderBy'];
     getBaseTables(): any[];
     getBaseTableFromThis(): TableInfo | ViewInfo | CollectionInfo;
@@ -112,7 +111,7 @@ export declare class PerspectiveTableColumnNode extends PerspectiveTreeNode {
     get title(): string;
     get isExpandable(): boolean;
     get isSortable(): boolean;
-    get filterType(): FilterType;
+    get filterBehaviour(): FilterBehaviour;
     get isCircular(): boolean;
     get isSecondaryChecked(): boolean;
     get isChecked(): boolean;
@@ -151,7 +150,7 @@ export declare class PerspectivePatternColumnNode extends PerspectiveTreeNode {
     get title(): string;
     get isExpandable(): boolean;
     get isSortable(): boolean;
-    get filterType(): FilterType;
+    get filterBehaviour(): FilterBehaviour;
     get preloadedLevelData(): boolean;
     generatePatternChildNodes(): PerspectivePatternColumnNode[];
     hasCheckedJoinChild(): boolean;

package/lib/PerspectiveTreeNode.js

@@ -166,8 +166,8 @@ class PerspectiveTreeNode {
     get columnTitle() {
         return this.title;
     }
-    get filterType() {
-        return 'string';
+    get filterBehaviour() {
+        return dbgate_tools_1.stringFilterBehaviour;
     }
     get columnName() {
         return null;
@@ -273,6 +273,21 @@ class PerspectiveTreeNode {
                 .map(x => x.columnName),
         ]));
     }
+    getMutliColumnCondition(source) {
+        var _a;
+        if (!((_a = this.nodeConfig) === null || _a === void 0 ? void 0 : _a.multiColumnFilter))
+            return null;
+        const base = this.getBaseTableFromThis();
+        if (!base)
+            return null;
+        const isDocDb = (0, dbgate_tools_1.isCollectionInfo)(base);
+        if (isDocDb) {
+            return this.getMutliColumnNoSqlCondition();
+        }
+        else {
+            return this.getMutliColumnSqlCondition(source);
+        }
+    }
     getMutliColumnSqlCondition(source) {
         var _a, _b;
         if (!((_a = this.nodeConfig) === null || _a === void 0 ? void 0 : _a.multiColumnFilter))
@@ -281,7 +296,7 @@ class PerspectiveTreeNode {
         if (!base)
             return null;
         try {
-            const condition = (0, dbgate_filterparser_1.parseFilter)((_b = this.nodeConfig) === null || _b === void 0 ? void 0 : _b.multiColumnFilter, 'string');
+            const condition = (0, dbgate_filterparser_1.parseFilter)((_b = this.nodeConfig) === null || _b === void 0 ? void 0 : _b.multiColumnFilter, dbgate_tools_1.stringFilterBehaviour);
             if (condition) {
                 const orCondition = {
                     conditionType: 'or',
@@ -308,34 +323,39 @@ class PerspectiveTreeNode {
         }
         return null;
     }
-    getMutliColumnMongoCondition() {
+    getMutliColumnNoSqlCondition() {
         var _a, _b, _c, _d;
         if (!((_a = this.nodeConfig) === null || _a === void 0 ? void 0 : _a.multiColumnFilter))
             return null;
         const pattern = (_c = (_b = this.dataProvider) === null || _b === void 0 ? void 0 : _b.dataPatterns) === null || _c === void 0 ? void 0 : _c[this.designerId];
         if (!pattern)
             return null;
-        const condition = (0, dbgate_filterparser_1.parseFilter)((_d = this.nodeConfig) === null || _d === void 0 ? void 0 : _d.multiColumnFilter, 'mongo');
+        const condition = (0, dbgate_filterparser_1.parseFilter)((_d = this.nodeConfig) === null || _d === void 0 ? void 0 : _d.multiColumnFilter, dbgate_tools_1.mongoFilterBehaviour);
         if (!condition)
             return null;
-        const res = pattern.columns.map(col => {
-            return (0, cloneDeepWith_1.default)(condition, expr => {
-                if (expr.__placeholder__) {
+        const orCondition = {
+            conditionType: 'or',
+            conditions: [],
+        };
+        for (const column of pattern.columns || []) {
+            orCondition.conditions.push((0, cloneDeepWith_1.default)(condition, (expr) => {
+                if (expr.exprType == 'placeholder') {
                     return {
-                        [col.name]: expr.__placeholder__,
+                        exprType: 'column',
+                        columnName: column.name,
                     };
                 }
-            });
-        });
-        return {
-            $or: res,
-        };
+            }));
+        }
+        if (orCondition.conditions.length > 0) {
+            return orCondition;
+        }
     }
     getChildrenSqlCondition(source = null) {
         const conditions = (0, compact_1.default)([
             ...this.childNodes.map(x => x.parseFilterCondition(source)),
             ...this.buildParentFilterConditions(),
-            this.getMutliColumnSqlCondition(source),
+            this.getMutliColumnCondition(source),
         ]);
         if (conditions.length == 0) {
             return null;
@@ -348,19 +368,6 @@ class PerspectiveTreeNode {
             conditions,
         };
     }
-    getChildrenMongoCondition(source = null) {
-        const conditions = (0, compact_1.default)([
-            ...this.childNodes.map(x => x.parseFilterCondition(source)),
-            this.getMutliColumnMongoCondition(),
-        ]);
-        if (conditions.length == 0) {
-            return null;
-        }
-        if (conditions.length == 1) {
-            return conditions[0];
-        }
-        return { $and: conditions };
-    }
     getOrderBy(table) {
         var _a;
         const res = (0, compact_1.default)(this.childNodes.map(node => {
@@ -381,6 +388,9 @@ class PerspectiveTreeNode {
         }));
         if (pkColumns)
             return pkColumns;
+        const uqColumns = table === null || table === void 0 ? void 0 : table.uniqueKey;
+        if ((uqColumns === null || uqColumns === void 0 ? void 0 : uqColumns.length) >= 1)
+            return uqColumns.map(x => ({ columnName: x.columnName, order: 'ASC' }));
         const columns = table === null || table === void 0 ? void 0 : table.columns;
         if (columns)
             return [{ columnName: columns[0].columnName, order: 'ASC' }];
@@ -613,8 +623,8 @@ class PerspectiveTableColumnNode extends PerspectiveTreeNode {
     get isSortable() {
         return true;
     }
-    get filterType() {
-        return (0, dbgate_filterparser_1.getFilterType)(this.column.dataType);
+    get filterBehaviour() {
+        return (0, dbgate_tools_1.detectSqlFilterBehaviour)(this.column.dataType);
     }
     get isCircular() {
         var _a, _b;
@@ -655,7 +665,7 @@ class PerspectiveTableColumnNode extends PerspectiveTreeNode {
     get filterInfo() {
         return {
             columnName: this.columnName,
-            filterType: this.filterType,
+            filterBehaviour: this.filterBehaviour,
             pureName: this.column.pureName,
             schemaName: this.column.schemaName,
             foreignKey: this.foreignKey,
@@ -665,7 +675,7 @@ class PerspectiveTableColumnNode extends PerspectiveTreeNode {
         const filter = this.getFilter();
         if (!filter)
             return null;
-        const condition = (0, dbgate_filterparser_1.parseFilter)(filter, this.filterType);
+        const condition = (0, dbgate_filterparser_1.parseFilter)(filter, this.filterBehaviour);
         if (!condition)
             return null;
         return (0, cloneDeepWith_1.default)(condition, (expr) => {
@@ -807,10 +817,10 @@ class PerspectivePatternColumnNode extends PerspectiveTreeNode {
     get isSortable() {
         return !this.isChildColumn;
     }
-    get filterType() {
+    get filterBehaviour() {
         if (this.tableColumn)
-            return (0, dbgate_filterparser_1.getFilterType)(this.tableColumn.dataType);
-        return 'mongo';
+            return (0, dbgate_tools_1.detectSqlFilterBehaviour)(this.tableColumn.dataType);
+        return dbgate_tools_1.mongoFilterBehaviour;
     }
     get preloadedLevelData() {
         return true;
@@ -907,7 +917,7 @@ class PerspectivePatternColumnNode extends PerspectiveTreeNode {
         }
         return {
             columnName: this.columnName,
-            filterType: this.filterType,
+            filterBehaviour: this.filterBehaviour,
             pureName: this.table.pureName,
             schemaName: this.table.schemaName,
             foreignKey: this.foreignKey,
@@ -917,7 +927,7 @@ class PerspectivePatternColumnNode extends PerspectiveTreeNode {
         const filter = this.getFilter();
         if (!filter)
             return null;
-        const condition = (0, dbgate_filterparser_1.parseFilter)(filter, 'mongo');
+        const condition = (0, dbgate_filterparser_1.parseFilter)(filter, dbgate_tools_1.mongoFilterBehaviour);
         if (!condition)
             return null;
         return (0, cloneDeepWith_1.default)(condition, expr => {
@@ -940,17 +950,16 @@ class PerspectiveTableNode extends PerspectiveTreeNode {
         return (0, dbgate_tools_1.isCollectionInfo)(this.table) ? 'docdb' : 'sqldb';
     }
     getNodeLoadProps(parentRows) {
-        const isMongo = (0, dbgate_tools_1.isCollectionInfo)(this.table);
+        const isDocDb = (0, dbgate_tools_1.isCollectionInfo)(this.table);
         return {
             schemaName: this.table.schemaName,
             pureName: this.table.pureName,
             dataColumns: this.getDataLoadColumns(),
-            allColumns: isMongo,
+            allColumns: isDocDb,
             databaseConfig: this.databaseConfig,
             orderBy: this.getOrderBy(this.table),
-            sqlCondition: isMongo ? null : this.getChildrenSqlCondition(),
-            mongoCondition: isMongo ? this.getChildrenMongoCondition() : null,
-            engineType: isMongo ? 'docdb' : 'sqldb',
+            sqlCondition: this.getChildrenSqlCondition(),
+            engineType: isDocDb ? 'docdb' : 'sqldb',
         };
     }
     get codeName() {
@@ -1105,7 +1114,7 @@ class PerspectiveCustomJoinTreeNode extends PerspectiveTableNode {
         // console.log('CUSTOM JOIN', this.customJoin);
         // console.log('PARENT ROWS', parentRows);
         // console.log('this.getDataLoadColumns()', this.getDataLoadColumns());
-        const isMongo = (0, dbgate_tools_1.isCollectionInfo)(this.table);
+        const isDocDb = (0, dbgate_tools_1.isCollectionInfo)(this.table);
         // const bindingValues = [];
         // for (const row of parentRows) {
         //   const rowBindingValueArrays = [];
@@ -1153,12 +1162,12 @@ class PerspectiveCustomJoinTreeNode extends PerspectiveTableNode {
             bindingColumns: this.getParentMatchColumns(),
             bindingValues: (0, uniqBy_1.default)(bindingValues, x => JSON.stringify(x)),
             dataColumns: this.getDataLoadColumns(),
-            allColumns: isMongo,
+            allColumns: isDocDb,
             databaseConfig: this.databaseConfig,
             orderBy: this.getOrderBy(this.table),
-            sqlCondition: isMongo ? null : this.getChildrenSqlCondition(),
-            mongoCondition: isMongo ? this.getChildrenMongoCondition() : null,
-            engineType: isMongo ? 'docdb' : 'sqldb',
+            sqlCondition: this.getChildrenSqlCondition(),
+            // mongoCondition: isMongo ? this.getChildrenMongoCondition() : null,
+            engineType: isDocDb ? 'docdb' : 'sqldb',
         };
     }
     // get title() {

package/lib/index.d.ts

@@ -21,3 +21,4 @@ export * from './perspectiveTools';
 export * from './DataDuplicator';
 export * from './FreeTableGridDisplay';
 export * from './FreeTableModel';
+export * from './CustomGridDisplay';

package/lib/index.js

@@ -37,3 +37,4 @@ __exportStar(require("./perspectiveTools"), exports);
 __exportStar(require("./DataDuplicator"), exports);
 __exportStar(require("./FreeTableGridDisplay"), exports);
 __exportStar(require("./FreeTableModel"), exports);
+__exportStar(require("./CustomGridDisplay"), exports);

package/package.json

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