dbgate-datalib 5.2.2 → 5.2.4-alpha.1

package/lib/PerspectiveTreeNode.d.ts

@@ -14,9 +14,9 @@ export declare abstract class PerspectiveTreeNode {
     setConfig: ChangePerspectiveConfigFunc;
     parentNode: PerspectiveTreeNode;
     dataProvider: PerspectiveDataProvider;
-    databaseConfig: PerspectiveDatabaseConfig;
+    defaultDatabaseConfig: PerspectiveDatabaseConfig;
     designerId: string;
-    constructor(dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, parentNode: PerspectiveTreeNode, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig, designerId: string);
+    constructor(dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, parentNode: PerspectiveTreeNode, dataProvider: PerspectiveDataProvider, defaultDatabaseConfig: PerspectiveDatabaseConfig, designerId: string);
     readonly nodeConfig: PerspectiveNodeConfig;
     parentNodeConfig: PerspectiveNodeConfig;
     abstract get title(): any;
@@ -33,6 +33,7 @@ export declare abstract class PerspectiveTreeNode {
     get namedObject(): NamedObjectInfo;
     get tableNodeOrParent(): PerspectiveTableNode;
     get engineType(): PerspectiveDatabaseEngineType;
+    get databaseConfig(): PerspectiveDatabaseConfig;
     abstract getNodeLoadProps(parentRows: any[]): PerspectiveDataLoadProps;
     get isRoot(): boolean;
     get rootNode(): PerspectiveTreeNode;
@@ -72,11 +73,13 @@ export declare abstract class PerspectiveTreeNode {
     includeInNodeSet(field: 'expandedColumns' | 'uncheckedColumns' | 'checkedColumns', isIncluded: boolean): void;
     getFilter(): string;
     getDataLoadColumns(): any[];
+    getMutliColumnSqlCondition(source: any): Condition;
+    getMutliColumnMongoCondition(): {};
     getChildrenSqlCondition(source?: any): Condition;
     getChildrenMongoCondition(source?: any): {};
     getOrderBy(table: TableInfo | ViewInfo | CollectionInfo): PerspectiveDataLoadProps['orderBy'];
     getBaseTables(): any[];
-    getBaseTableFromThis(): any;
+    getBaseTableFromThis(): TableInfo | ViewInfo | CollectionInfo;
     get filterInfo(): PerspectiveFilterColumnInfo;
     findChildNodeByUniquePath(uniquePath: string[]): any;
     findNodeByDesignerId(designerId: string): PerspectiveTreeNode;
@@ -94,7 +97,7 @@ export declare class PerspectiveTableColumnNode extends PerspectiveTreeNode {
     refTable: TableInfo;
     isView: boolean;
     isTable: boolean;
-    constructor(column: ColumnInfo, table: TableInfo | ViewInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig, parentNode: PerspectiveTreeNode, designerId: string);
+    constructor(column: ColumnInfo, table: TableInfo | ViewInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, defaultDatabaseConfig: PerspectiveDatabaseConfig, parentNode: PerspectiveTreeNode, designerId: string);
     get engineType(): PerspectiveDatabaseEngineType;
     matchChildRow(parentRow: any, childRow: any): boolean;
     getChildMatchColumns(): string[];
@@ -136,7 +139,7 @@ export declare class PerspectivePatternColumnNode extends PerspectiveTreeNode {
     tableColumn: ColumnInfo;
     foreignKey: ForeignKeyInfo;
     refTable: TableInfo;
-    constructor(table: TableInfo | ViewInfo | CollectionInfo, column: PerspectiveDataPatternColumn, tableColumn: ColumnInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig, parentNode: PerspectiveTreeNode, designerId: string);
+    constructor(table: TableInfo | ViewInfo | CollectionInfo, column: PerspectiveDataPatternColumn, tableColumn: ColumnInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, defaultDatabaseConfig: PerspectiveDatabaseConfig, parentNode: PerspectiveTreeNode, designerId: string);
     get isChildColumn(): boolean;
     get findByDesignerIdWithoutDesignerId(): boolean;
     getNodeLoadProps(parentRows: any[]): PerspectiveDataLoadProps;
@@ -159,7 +162,7 @@ export declare class PerspectivePatternColumnNode extends PerspectiveTreeNode {
 export declare class PerspectiveTableNode extends PerspectiveTreeNode {
     table: TableInfo | ViewInfo | CollectionInfo;
     dataProvider: PerspectiveDataProvider;
-    constructor(table: TableInfo | ViewInfo | CollectionInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig, parentNode: PerspectiveTreeNode, designerId: string);
+    constructor(table: TableInfo | ViewInfo | CollectionInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, defaultDatabaseConfig: PerspectiveDatabaseConfig, parentNode: PerspectiveTreeNode, designerId: string);
     get engineType(): PerspectiveDatabaseEngineType;
     getNodeLoadProps(parentRows: any[]): PerspectiveDataLoadProps;
     get codeName(): string;
@@ -182,7 +185,7 @@ export declare class PerspectiveTableReferenceNode extends PerspectiveTableNode
     foreignKey: ForeignKeyInfo;
     dataProvider: PerspectiveDataProvider;
     isMultiple: boolean;
-    constructor(foreignKey: ForeignKeyInfo, table: TableInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig, isMultiple: boolean, parentNode: PerspectiveTreeNode, designerId: string);
+    constructor(foreignKey: ForeignKeyInfo, table: TableInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, defaultDatabaseConfig: PerspectiveDatabaseConfig, isMultiple: boolean, parentNode: PerspectiveTreeNode, designerId: string);
     matchChildRow(parentRow: any, childRow: any): boolean;
     getChildMatchColumns(): string[];
     getParentMatchColumns(): string[];
@@ -198,7 +201,7 @@ export declare class PerspectiveTableReferenceNode extends PerspectiveTableNode
 export declare class PerspectiveCustomJoinTreeNode extends PerspectiveTableNode {
     customJoin: PerspectiveCustomJoinConfig;
     dataProvider: PerspectiveDataProvider;
-    constructor(customJoin: PerspectiveCustomJoinConfig, table: TableInfo | ViewInfo | CollectionInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig, parentNode: PerspectiveTreeNode, designerId: string);
+    constructor(customJoin: PerspectiveCustomJoinConfig, table: TableInfo | ViewInfo | CollectionInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, defaultDatabaseConfig: PerspectiveDatabaseConfig, parentNode: PerspectiveTreeNode, designerId: string);
     matchChildRow(parentRow: any, childRow: any): boolean;
     getChildMatchColumns(): string[];
     getParentMatchColumns(): string[];
@@ -210,4 +213,4 @@ export declare class PerspectiveCustomJoinTreeNode extends PerspectiveTableNode
     toggleChecked(value?: boolean): void;
     getParentJoinCondition(alias: string, parentAlias: string): Condition[];
 }
-export declare function getTableChildPerspectiveNodes(table: TableInfo | ViewInfo | CollectionInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, databaseConfig: PerspectiveDatabaseConfig, parentNode: PerspectiveTreeNode): any[];
+export declare function getTableChildPerspectiveNodes(table: TableInfo | ViewInfo | CollectionInfo, dbs: MultipleDatabaseInfo, config: PerspectiveConfig, setConfig: ChangePerspectiveConfigFunc, dataProvider: PerspectiveDataProvider, defaultDatabaseConfig: PerspectiveDatabaseConfig, parentNode: PerspectiveTreeNode): any[];

package/lib/PerspectiveTreeNode.js

@@ -40,13 +40,13 @@ const perspectiveTools_1 = require("./perspectiveTools");
 //   return res;
 // }
 class PerspectiveTreeNode {
-    constructor(dbs, config, setConfig, parentNode, dataProvider, databaseConfig, designerId) {
+    constructor(dbs, config, setConfig, parentNode, dataProvider, defaultDatabaseConfig, designerId) {
         this.dbs = dbs;
         this.config = config;
         this.setConfig = setConfig;
         this.parentNode = parentNode;
         this.dataProvider = dataProvider;
-        this.databaseConfig = databaseConfig;
+        this.defaultDatabaseConfig = defaultDatabaseConfig;
         this.designerId = designerId;
         this.childNodesCache = null;
         this.nodeConfig = config.nodes.find(x => x.designerId == designerId);
@@ -85,6 +85,15 @@ class PerspectiveTreeNode {
     get engineType() {
         return null;
     }
+    get databaseConfig() {
+        var _a, _b, _c, _d;
+        const res = Object.assign({}, this.defaultDatabaseConfig);
+        if ((_a = this.nodeConfig) === null || _a === void 0 ? void 0 : _a.conid)
+            res.conid = (_b = this.nodeConfig) === null || _b === void 0 ? void 0 : _b.conid;
+        if ((_c = this.nodeConfig) === null || _c === void 0 ? void 0 : _c.database)
+            res.database = (_d = this.nodeConfig) === null || _d === void 0 ? void 0 : _d.database;
+        return res;
+    }
     get isRoot() {
         return this.parentNode == null;
     }
@@ -264,10 +273,69 @@ class PerspectiveTreeNode {
                 .map(x => x.columnName),
         ]));
     }
+    getMutliColumnSqlCondition(source) {
+        var _a, _b;
+        if (!((_a = this.nodeConfig) === null || _a === void 0 ? void 0 : _a.multiColumnFilter))
+            return null;
+        const base = this.getBaseTableFromThis();
+        if (!base)
+            return null;
+        try {
+            const condition = (0, dbgate_filterparser_1.parseFilter)((_b = this.nodeConfig) === null || _b === void 0 ? void 0 : _b.multiColumnFilter, 'string');
+            if (condition) {
+                const orCondition = {
+                    conditionType: 'or',
+                    conditions: [],
+                };
+                for (const column of base.columns || []) {
+                    orCondition.conditions.push((0, cloneDeepWith_1.default)(condition, (expr) => {
+                        if (expr.exprType == 'placeholder') {
+                            return {
+                                exprType: 'column',
+                                alias: source,
+                                columnName: column.columnName,
+                            };
+                        }
+                    }));
+                }
+                if (orCondition.conditions.length > 0) {
+                    return orCondition;
+                }
+            }
+        }
+        catch (err) {
+            console.warn(err.message);
+        }
+        return null;
+    }
+    getMutliColumnMongoCondition() {
+        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');
+        if (!condition)
+            return null;
+        const res = pattern.columns.map(col => {
+            return (0, cloneDeepWith_1.default)(condition, expr => {
+                if (expr.__placeholder__) {
+                    return {
+                        [col.name]: expr.__placeholder__,
+                    };
+                }
+            });
+        });
+        return {
+            $or: res,
+        };
+    }
     getChildrenSqlCondition(source = null) {
         const conditions = (0, compact_1.default)([
             ...this.childNodes.map(x => x.parseFilterCondition(source)),
             ...this.buildParentFilterConditions(),
+            this.getMutliColumnSqlCondition(source),
         ]);
         if (conditions.length == 0) {
             return null;
@@ -281,7 +349,10 @@ class PerspectiveTreeNode {
         };
     }
     getChildrenMongoCondition(source = null) {
-        const conditions = (0, compact_1.default)([...this.childNodes.map(x => x.parseFilterCondition(source))]);
+        const conditions = (0, compact_1.default)([
+            ...this.childNodes.map(x => x.parseFilterCondition(source)),
+            this.getMutliColumnMongoCondition(),
+        ]);
         if (conditions.length == 0) {
             return null;
         }
@@ -443,9 +514,9 @@ class PerspectiveTreeNode {
 }
 exports.PerspectiveTreeNode = PerspectiveTreeNode;
 class PerspectiveTableColumnNode extends PerspectiveTreeNode {
-    constructor(column, table, dbs, config, setConfig, dataProvider, databaseConfig, parentNode, designerId) {
+    constructor(column, table, dbs, config, setConfig, dataProvider, defaultDatabaseConfig, parentNode, designerId) {
         var _a, _b, _c, _d, _e;
-        super(dbs, config, setConfig, parentNode, dataProvider, databaseConfig, designerId);
+        super(dbs, config, setConfig, parentNode, dataProvider, defaultDatabaseConfig, designerId);
         this.column = column;
         this.table = table;
         this.isTable = !!((_b = (_a = this.db) === null || _a === void 0 ? void 0 : _a.tables) === null || _b === void 0 ? void 0 : _b.find(x => x.schemaName == table.schemaName && x.pureName == table.pureName));
@@ -576,7 +647,7 @@ class PerspectiveTableColumnNode extends PerspectiveTreeNode {
         if (!this.foreignKey)
             return [];
         const tbl = (_b = (_a = this === null || this === void 0 ? void 0 : this.db) === null || _a === void 0 ? void 0 : _a.tables) === null || _b === void 0 ? void 0 : _b.find(x => { var _a, _b; return x.pureName == ((_a = this.foreignKey) === null || _a === void 0 ? void 0 : _a.refTableName) && x.schemaName == ((_b = this.foreignKey) === null || _b === void 0 ? void 0 : _b.refSchemaName); });
-        return getTableChildPerspectiveNodes(tbl, this.dbs, this.config, this.setConfig, this.dataProvider, this.databaseConfig, this);
+        return getTableChildPerspectiveNodes(tbl, this.dbs, this.config, this.setConfig, this.dataProvider, this.defaultDatabaseConfig, this);
     }
     getBaseTableFromThis() {
         return this.refTable;
@@ -637,9 +708,9 @@ class PerspectiveTableColumnNode extends PerspectiveTreeNode {
 }
 exports.PerspectiveTableColumnNode = PerspectiveTableColumnNode;
 class PerspectivePatternColumnNode extends PerspectiveTreeNode {
-    constructor(table, column, tableColumn, dbs, config, setConfig, dataProvider, databaseConfig, parentNode, designerId) {
+    constructor(table, column, tableColumn, dbs, config, setConfig, dataProvider, defaultDatabaseConfig, parentNode, designerId) {
         var _a;
-        super(dbs, config, setConfig, parentNode, dataProvider, databaseConfig, designerId);
+        super(dbs, config, setConfig, parentNode, dataProvider, defaultDatabaseConfig, designerId);
         this.table = table;
         this.column = column;
         this.tableColumn = tableColumn;
@@ -745,7 +816,7 @@ class PerspectivePatternColumnNode extends PerspectiveTreeNode {
         return true;
     }
     generatePatternChildNodes() {
-        return this.column.columns.map(column => new PerspectivePatternColumnNode(this.table, column, this.tableColumn, this.dbs, this.config, this.setConfig, this.dataProvider, this.databaseConfig, this, null));
+        return this.column.columns.map(column => new PerspectivePatternColumnNode(this.table, column, this.tableColumn, this.dbs, this.config, this.setConfig, this.dataProvider, this.defaultDatabaseConfig, this, null));
     }
     hasCheckedJoinChild() {
         for (const node of this.childNodes) {
@@ -786,7 +857,7 @@ class PerspectivePatternColumnNode extends PerspectiveTreeNode {
                         continue;
                     }
                     // console.log('CP2');
-                    const newConfig = Object.assign({}, this.databaseConfig);
+                    const newConfig = Object.assign({}, this.defaultDatabaseConfig);
                     if (node.conid)
                         newConfig.conid = node.conid;
                     if (node.database)
@@ -809,7 +880,7 @@ class PerspectivePatternColumnNode extends PerspectiveTreeNode {
                             : ref.columns.map(col => ({ baseColumnName: col.target, refColumnName: col.source })),
                     };
                     if (table || view || collection) {
-                        customs.push(new PerspectiveCustomJoinTreeNode(join, table || view || collection, this.dbs, this.config, this.setConfig, this.dataProvider, newConfig, this, node.designerId));
+                        customs.push(new PerspectiveCustomJoinTreeNode(join, table || view || collection, this.dbs, this.config, this.setConfig, this.dataProvider, this.defaultDatabaseConfig, this, node.designerId));
                     }
                 }
             }
@@ -860,8 +931,8 @@ class PerspectivePatternColumnNode extends PerspectiveTreeNode {
 }
 exports.PerspectivePatternColumnNode = PerspectivePatternColumnNode;
 class PerspectiveTableNode extends PerspectiveTreeNode {
-    constructor(table, dbs, config, setConfig, dataProvider, databaseConfig, parentNode, designerId) {
-        super(dbs, config, setConfig, parentNode, dataProvider, databaseConfig, designerId);
+    constructor(table, dbs, config, setConfig, dataProvider, defaultDatabaseConfig, parentNode, designerId) {
+        super(dbs, config, setConfig, parentNode, dataProvider, defaultDatabaseConfig, designerId);
         this.table = table;
         this.dataProvider = dataProvider;
     }
@@ -893,7 +964,7 @@ class PerspectiveTableNode extends PerspectiveTreeNode {
         return true;
     }
     generateChildNodes() {
-        return getTableChildPerspectiveNodes(this.table, this.dbs, this.config, this.setConfig, this.dataProvider, this.databaseConfig, this);
+        return getTableChildPerspectiveNodes(this.table, this.dbs, this.config, this.setConfig, this.dataProvider, this.defaultDatabaseConfig, this);
     }
     get icon() {
         return 'img table';
@@ -922,8 +993,8 @@ class PerspectiveTableNode extends PerspectiveTreeNode {
 }
 exports.PerspectiveTableNode = PerspectiveTableNode;
 class PerspectiveTableReferenceNode extends PerspectiveTableNode {
-    constructor(foreignKey, table, dbs, config, setConfig, dataProvider, databaseConfig, isMultiple, parentNode, designerId) {
-        super(table, dbs, config, setConfig, dataProvider, databaseConfig, parentNode, designerId);
+    constructor(foreignKey, table, dbs, config, setConfig, dataProvider, defaultDatabaseConfig, isMultiple, parentNode, designerId) {
+        super(table, dbs, config, setConfig, dataProvider, defaultDatabaseConfig, parentNode, designerId);
         this.foreignKey = foreignKey;
         this.dataProvider = dataProvider;
         this.isMultiple = isMultiple;
@@ -1010,8 +1081,8 @@ class PerspectiveTableReferenceNode extends PerspectiveTableNode {
 }
 exports.PerspectiveTableReferenceNode = PerspectiveTableReferenceNode;
 class PerspectiveCustomJoinTreeNode extends PerspectiveTableNode {
-    constructor(customJoin, table, dbs, config, setConfig, dataProvider, databaseConfig, parentNode, designerId) {
-        super(table, dbs, config, setConfig, dataProvider, databaseConfig, parentNode, designerId);
+    constructor(customJoin, table, dbs, config, setConfig, dataProvider, defaultDatabaseConfig, parentNode, designerId) {
+        super(table, dbs, config, setConfig, dataProvider, defaultDatabaseConfig, parentNode, designerId);
         this.customJoin = customJoin;
         this.dataProvider = dataProvider;
     }
@@ -1153,7 +1224,7 @@ function findDesignerIdForNode(config, parentNode, nodeCreateFunc) {
     }
     return node;
 }
-function getTableChildPerspectiveNodes(table, dbs, config, setConfig, dataProvider, databaseConfig, parentNode) {
+function getTableChildPerspectiveNodes(table, dbs, config, setConfig, dataProvider, defaultDatabaseConfig, parentNode) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     if (!table)
         return [];
@@ -1163,10 +1234,10 @@ function getTableChildPerspectiveNodes(table, dbs, config, setConfig, dataProvid
     const columnNodes = ((_b = tableOrView === null || tableOrView === void 0 ? void 0 : tableOrView.columns) === null || _b === void 0 ? void 0 : _b.map(col => findDesignerIdForNode(config, parentNode, designerId => {
         var _a, _b, _c;
         return ((_b = (_a = pattern === null || pattern === void 0 ? void 0 : pattern.columns) === null || _a === void 0 ? void 0 : _a.find(x => x.name == col.columnName)) === null || _b === void 0 ? void 0 : _b.types.includes('json'))
-            ? new PerspectivePatternColumnNode(table, (_c = pattern === null || pattern === void 0 ? void 0 : pattern.columns) === null || _c === void 0 ? void 0 : _c.find(x => x.name == col.columnName), col, dbs, config, setConfig, dataProvider, databaseConfig, parentNode, designerId)
-            : new PerspectiveTableColumnNode(col, tableOrView, dbs, config, setConfig, dataProvider, databaseConfig, parentNode, designerId);
+            ? new PerspectivePatternColumnNode(table, (_c = pattern === null || pattern === void 0 ? void 0 : pattern.columns) === null || _c === void 0 ? void 0 : _c.find(x => x.name == col.columnName), col, dbs, config, setConfig, dataProvider, defaultDatabaseConfig, parentNode, designerId)
+            : new PerspectiveTableColumnNode(col, tableOrView, dbs, config, setConfig, dataProvider, defaultDatabaseConfig, parentNode, designerId);
     }))) ||
-        ((_c = pattern === null || pattern === void 0 ? void 0 : pattern.columns) === null || _c === void 0 ? void 0 : _c.map(col => findDesignerIdForNode(config, parentNode, designerId => new PerspectivePatternColumnNode(table, col, null, dbs, config, setConfig, dataProvider, databaseConfig, parentNode, designerId)))) ||
+        ((_c = pattern === null || pattern === void 0 ? void 0 : pattern.columns) === null || _c === void 0 ? void 0 : _c.map(col => findDesignerIdForNode(config, parentNode, designerId => new PerspectivePatternColumnNode(table, col, null, dbs, config, setConfig, dataProvider, defaultDatabaseConfig, parentNode, designerId)))) ||
         [];
     // if (!columnNodes.find(x => x.isChecked)) {
     //   const circularColumns = columnNodes.filter(x => x.isCircular).map(x => x.columnName);
@@ -1185,7 +1256,7 @@ function getTableChildPerspectiveNodes(table, dbs, config, setConfig, dataProvid
             const tbl = db.tables.find(x => x.pureName == fk.pureName && x.schemaName == fk.schemaName);
             if (tbl) {
                 const isMultiple = (table === null || table === void 0 ? void 0 : table.dependencies.filter(x => x.pureName == fk.pureName && x.schemaName == fk.schemaName).length) >= 2;
-                dependencies.push(findDesignerIdForNode(config, parentNode, designerId => new PerspectiveTableReferenceNode(fk, tbl, dbs, config, setConfig, dataProvider, databaseConfig, isMultiple, parentNode, designerId)));
+                dependencies.push(findDesignerIdForNode(config, parentNode, designerId => new PerspectiveTableReferenceNode(fk, tbl, dbs, config, setConfig, dataProvider, defaultDatabaseConfig, isMultiple, parentNode, designerId)));
             }
         }
     }
@@ -1202,7 +1273,7 @@ function getTableChildPerspectiveNodes(table, dbs, config, setConfig, dataProvid
                 if (ref.columns.find(x => x.source.includes('::') || x.target.includes('::'))) {
                     continue;
                 }
-                const newConfig = Object.assign({}, databaseConfig);
+                const newConfig = Object.assign({}, defaultDatabaseConfig);
                 if (node.conid)
                     newConfig.conid = node.conid;
                 if (node.database)
@@ -1225,7 +1296,7 @@ function getTableChildPerspectiveNodes(table, dbs, config, setConfig, dataProvid
                         : ref.columns.map(col => ({ baseColumnName: col.target, refColumnName: col.source })),
                 };
                 if (table || view || collection) {
-                    customs.push(new PerspectiveCustomJoinTreeNode(join, table || view || collection, dbs, config, setConfig, dataProvider, newConfig, parentNode, node.designerId));
+                    customs.push(new PerspectiveCustomJoinTreeNode(join, table || view || collection, dbs, config, setConfig, dataProvider, defaultDatabaseConfig, parentNode, node.designerId));
                 }
             }
         }

package/lib/deleteCascade.js

@@ -39,7 +39,7 @@ function processDependencies(changeSet, result, allForeignKeys, fkPath, table, b
                             schemaName: fk.schemaName,
                         },
                         alias: 't0',
-                        relations: subFkPath.map((fkItem, fkIndex) => ({
+                        relations: [...subFkPath].reverse().map((fkItem, fkIndex) => ({
                             joinType: 'INNER JOIN',
                             alias: `t${fkIndex + 1}`,
                             name: {
@@ -106,7 +106,17 @@ function getDeleteCascades(changeSet, dbinfo) {
         const table = dbinfo.tables.find(x => x.pureName == baseCmd.pureName && x.schemaName == baseCmd.schemaName);
         if (!table.primaryKey)
             continue;
-        processDependencies(changeSet, result, allForeignKeys, [], table, baseCmd, dbinfo, [table.pureName]);
+        const itemResult = [];
+        processDependencies(changeSet, itemResult, allForeignKeys, [], table, baseCmd, dbinfo, [table.pureName]);
+        for (const item of itemResult) {
+            const existing = result.find(x => x.title == item.title);
+            if (existing) {
+                existing.commands.push(...item.commands);
+            }
+            else {
+                result.push(item);
+            }
+        }
         // let resItem = result.find(x => x.title == baseCmd.pureName);
         // if (!resItem) {
         //   resItem = {

package/lib/index.d.ts

@@ -6,8 +6,6 @@ export * from './TableGridDisplay';
 export * from './ViewGridDisplay';
 export * from './JslGridDisplay';
 export * from './ChangeSet';
-export * from './FreeTableGridDisplay';
-export * from './FreeTableModel';
 export * from './MacroDefinition';
 export * from './runMacro';
 export * from './CollectionGridDisplay';
@@ -20,3 +18,4 @@ export * from './processPerspectiveDefaultColunns';
 export * from './PerspectiveDataPattern';
 export * from './PerspectiveDataLoader';
 export * from './perspectiveTools';
+export * from './DataDuplicator';

package/lib/index.js

@@ -22,12 +22,8 @@ __exportStar(require("./TableGridDisplay"), exports);
 __exportStar(require("./ViewGridDisplay"), exports);
 __exportStar(require("./JslGridDisplay"), exports);
 __exportStar(require("./ChangeSet"), exports);
-__exportStar(require("./FreeTableGridDisplay"), exports);
-__exportStar(require("./FreeTableModel"), exports);
 __exportStar(require("./MacroDefinition"), exports);
 __exportStar(require("./runMacro"), exports);
-// export * from './FormViewDisplay';
-// export * from './TableFormViewDisplay';
 __exportStar(require("./CollectionGridDisplay"), exports);
 __exportStar(require("./deleteCascade"), exports);
 __exportStar(require("./PerspectiveDisplay"), exports);
@@ -38,3 +34,4 @@ __exportStar(require("./processPerspectiveDefaultColunns"), exports);
 __exportStar(require("./PerspectiveDataPattern"), exports);
 __exportStar(require("./PerspectiveDataLoader"), exports);
 __exportStar(require("./perspectiveTools"), exports);
+__exportStar(require("./DataDuplicator"), exports);

package/lib/runMacro.d.ts

@@ -1,8 +1,7 @@
-import { FreeTableModel } from './FreeTableModel';
 import { MacroDefinition, MacroSelectedCell } from './MacroDefinition';
 import { ChangeSet } from './ChangeSet';
 import { GridDisplay } from './GridDisplay';
-export declare function runMacro(macro: MacroDefinition, macroArgs: {}, data: FreeTableModel, preview: boolean, selectedCells: MacroSelectedCell[], errors?: string[]): FreeTableModel;
 export declare function compileMacroFunction(macro: MacroDefinition, errors?: any[]): any;
-export declare function runMacroOnValue(compiledFunc: any, macroArgs: any, value: any, rowIndex: any, row: any, column: any, errors?: any[]): any;
-export declare function runMacroOnChangeSet(macro: MacroDefinition, macroArgs: {}, selectedCells: MacroSelectedCell[], changeSet: ChangeSet, display: GridDisplay): ChangeSet;
+export declare function runMacroOnValue(compiledFunc: any, macroArgs: any, value: any, rowIndex: number, row: any, column: string, errors?: any[]): any;
+export declare function runMacroOnRow(compiledFunc: any, macroArgs: any, rowIndex: number, row: any, columns: string[], errors?: any[]): any;
+export declare function runMacroOnChangeSet(macro: MacroDefinition, macroArgs: {}, selectedCells: MacroSelectedCell[], changeSet: ChangeSet, display: GridDisplay, useRowIndexInsteaOfCondition: boolean): ChangeSet;

package/lib/runMacro.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.runMacroOnChangeSet = exports.runMacroOnValue = exports.compileMacroFunction = exports.runMacro = void 0;
+exports.runMacroOnChangeSet = exports.runMacroOnRow = exports.runMacroOnValue = exports.compileMacroFunction = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const v1_1 = __importDefault(require("uuid/v1"));
 const v4_1 = __importDefault(require("uuid/v4"));
@@ -15,13 +15,8 @@ const getMacroFunction = {
     ${code}
 }
 `,
-    transformRows: code => `
-(rows, args, modules, selectedCells, cols, columns) => {
-  ${code}
-}
-`,
-    transformData: code => `
-(rows, args, modules, selectedCells, cols, columns) => {
+    transformRow: code => `
+(row, args, modules, rowIndex, columns) => {
   ${code}
 }
 `,
@@ -32,116 +27,6 @@ const modules = {
     uuidv4: v4_1.default,
     moment: moment_1.default,
 };
-function runTramsformValue(func, macroArgs, data, preview, selectedCells, errors = []) {
-    const selectedRows = lodash_1.default.groupBy(selectedCells, 'row');
-    const rows = data.rows.map((row, rowIndex) => {
-        const selectedRow = selectedRows[rowIndex];
-        if (selectedRow) {
-            const modifiedFields = [];
-            let res = null;
-            for (const cell of selectedRow) {
-                const { column } = cell;
-                const oldValue = row[column];
-                let newValue = oldValue;
-                try {
-                    newValue = func(oldValue, macroArgs, modules, rowIndex, row, column);
-                }
-                catch (err) {
-                    errors.push(`Error processing column ${column} on row ${rowIndex}: ${err.message}`);
-                }
-                if (newValue != oldValue) {
-                    if (res == null) {
-                        res = Object.assign({}, row);
-                    }
-                    res[column] = newValue;
-                    if (preview)
-                        modifiedFields.push(column);
-                }
-            }
-            if (res) {
-                if (modifiedFields.length > 0) {
-                    return Object.assign(Object.assign({}, res), { __modifiedFields: new Set(modifiedFields) });
-                }
-                return res;
-            }
-            return row;
-        }
-        else {
-            return row;
-        }
-    });
-    return {
-        structure: data.structure,
-        rows,
-    };
-}
-function removePreviewRowFlags(rows) {
-    rows = rows.filter(row => row.__rowStatus != 'deleted');
-    rows = rows.map(row => {
-        if (row.__rowStatus || row.__modifiedFields || row.__insertedFields || row.__deletedFields)
-            return lodash_1.default.omit(row, ['__rowStatus', '__modifiedFields', '__insertedFields', '__deletedFields']);
-        return row;
-    });
-    return rows;
-}
-function runTramsformRows(func, macroArgs, data, preview, selectedCells, errors = []) {
-    let rows = data.rows;
-    try {
-        rows = func(data.rows, macroArgs, modules, selectedCells, data.structure.columns.map(x => x.columnName), data.structure.columns);
-        if (!preview) {
-            rows = removePreviewRowFlags(rows);
-        }
-    }
-    catch (err) {
-        errors.push(`Error processing rows: ${err.message}`);
-    }
-    return {
-        structure: data.structure,
-        rows,
-    };
-}
-function runTramsformData(func, macroArgs, data, preview, selectedCells, errors = []) {
-    try {
-        let { rows, columns, cols } = func(data.rows, macroArgs, modules, selectedCells, data.structure.columns.map(x => x.columnName), data.structure.columns);
-        if (cols && !columns) {
-            columns = cols.map(columnName => ({ columnName }));
-        }
-        columns = lodash_1.default.uniqBy(columns, 'columnName');
-        if (!preview) {
-            rows = removePreviewRowFlags(rows);
-        }
-        return {
-            structure: { columns },
-            rows,
-        };
-    }
-    catch (err) {
-        errors.push(`Error processing data: ${err.message}`);
-    }
-    return data;
-}
-function runMacro(macro, macroArgs, data, preview, selectedCells, errors = []) {
-    let func;
-    try {
-        func = eval(getMacroFunction[macro.type](macro.code));
-    }
-    catch (err) {
-        errors.push(`Error compiling macro ${macro.name}: ${err.message}`);
-        return data;
-    }
-    if (macro.type == 'transformValue') {
-        return runTramsformValue(func, macroArgs, data, preview, selectedCells, errors);
-    }
-    if (macro.type == 'transformRows') {
-        return runTramsformRows(func, macroArgs, data, preview, selectedCells, errors);
-    }
-    if (macro.type == 'transformData') {
-        // @ts-ignore
-        return runTramsformData(func, macroArgs, data, preview, selectedCells, errors);
-    }
-    return data;
-}
-exports.runMacro = runMacro;
 function compileMacroFunction(macro, errors = []) {
     if (!macro)
         return null;
@@ -169,17 +54,45 @@ function runMacroOnValue(compiledFunc, macroArgs, value, rowIndex, row, column,
     }
 }
 exports.runMacroOnValue = runMacroOnValue;
-function runMacroOnChangeSet(macro, macroArgs, selectedCells, changeSet, display) {
+function runMacroOnRow(compiledFunc, macroArgs, rowIndex, row, columns, errors = []) {
+    if (!compiledFunc)
+        return row;
+    try {
+        const res = compiledFunc(row, macroArgs, modules, rowIndex, columns);
+        return res;
+    }
+    catch (err) {
+        errors.push(`Error processing row ${rowIndex}: ${err.message}`);
+        return row;
+    }
+}
+exports.runMacroOnRow = runMacroOnRow;
+function runMacroOnChangeSet(macro, macroArgs, selectedCells, changeSet, display, useRowIndexInsteaOfCondition) {
+    var _a;
     const errors = [];
     const compiledMacroFunc = compileMacroFunction(macro, errors);
     if (!compiledMacroFunc)
         return null;
-    let res = changeSet;
-    for (const cell of selectedCells) {
-        const definition = display.getChangeSetField(cell.rowData, cell.column, undefined);
-        const macroResult = runMacroOnValue(compiledMacroFunc, macroArgs, cell.value, cell.row, cell.rowData, cell.column, errors);
-        res = (0, ChangeSet_1.setChangeSetValue)(res, definition, macroResult);
+    if (macro.type == 'transformValue') {
+        let res = changeSet;
+        for (const cell of selectedCells) {
+            const definition = display.getChangeSetField(cell.rowData, cell.column, undefined, useRowIndexInsteaOfCondition ? cell.row : undefined, useRowIndexInsteaOfCondition);
+            const macroResult = runMacroOnValue(compiledMacroFunc, macroArgs, cell.value, cell.row, cell.rowData, cell.column, errors);
+            res = (0, ChangeSet_1.setChangeSetValue)(res, definition, macroResult);
+        }
+        return res;
+    }
+    if (macro.type == 'transformRow') {
+        let res = changeSet;
+        const rowIndexes = lodash_1.default.uniq(selectedCells.map(x => x.row));
+        for (const index of rowIndexes) {
+            const rowData = (_a = selectedCells.find(x => x.row == index)) === null || _a === void 0 ? void 0 : _a.rowData;
+            const columns = lodash_1.default.uniq(selectedCells.map(x => x.column));
+            const definition = display.getChangeSetRow(rowData, null, index, true);
+            const newRow = runMacroOnRow(compiledMacroFunc, macroArgs, index, rowData, columns);
+            res = (0, ChangeSet_1.setChangeSetRowData)(res, definition, newRow);
+        }
+        return res;
     }
-    return res;
 }
 exports.runMacroOnChangeSet = runMacroOnChangeSet;

package/package.json

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