dbgate-datalib 6.1.5 → 6.2.0

package/lib/ChangeSet.d.ts

@@ -1,5 +1,5 @@
 import { Command, Condition } from 'dbgate-sqltree';
-import type { NamedObjectInfo, DatabaseInfo, TableInfo } from 'dbgate-types';
+import type { NamedObjectInfo, DatabaseInfo, TableInfo, SqlDialect } from 'dbgate-types';
 import { JsonDataObjectUpdateCommand } from 'dbgate-tools';
 export interface ChangeSetItem {
     pureName: string;
@@ -45,8 +45,8 @@ export declare function findExistingChangeSetItem(changeSet: ChangeSet, definiti
 export declare function setChangeSetValue(changeSet: ChangeSet, definition: ChangeSetFieldDefinition, value: string): ChangeSet;
 export declare function setChangeSetRowData(changeSet: ChangeSet, definition: ChangeSetRowDefinition, document: any): ChangeSet;
 export declare function batchUpdateChangeSet(changeSet: ChangeSet, rowDefinitions: ChangeSetRowDefinition[], dataRows: []): ChangeSet;
-export declare function extractChangeSetCondition(item: ChangeSetItem, alias?: string): Condition;
-export declare function changeSetToSql(changeSet: ChangeSet, dbinfo: DatabaseInfo): Command[];
+export declare function extractChangeSetCondition(item: ChangeSetItem, alias?: string, table?: TableInfo, dialect?: SqlDialect): Condition;
+export declare function changeSetToSql(changeSet: ChangeSet, dbinfo: DatabaseInfo, dialect: SqlDialect): Command[];
 export declare function revertChangeSetRowChanges(changeSet: ChangeSet, definition: ChangeSetRowDefinition): ChangeSet;
 export declare function deleteChangeSetRows(changeSet: ChangeSet, definition: ChangeSetRowDefinition): ChangeSet;
 export declare function getChangeSetInsertedRows(changeSet: ChangeSet, name?: NamedObjectInfo): any[];

package/lib/ChangeSet.js

@@ -136,31 +136,53 @@ function batchUpdateChangeSet(changeSet, rowDefinitions, dataRows) {
     return changeSet;
 }
 exports.batchUpdateChangeSet = batchUpdateChangeSet;
-function extractFields(item, allowNulls = true, allowedDocumentColumns = []) {
+function extractFields(item, allowNulls = true, allowedDocumentColumns = [], table, dialect) {
     const allFields = Object.assign({}, item.fields);
+    function isUuidColumn(columnName) {
+        var _a;
+        return ((_a = table === null || table === void 0 ? void 0 : table.columns.find(x => x.columnName == columnName)) === null || _a === void 0 ? void 0 : _a.dataType.toLowerCase()) == 'uuid';
+    }
+    function createUpdateField(targetColumn) {
+        var _a, _b;
+        const shouldGenerateDefaultValue = isUuidColumn(targetColumn) && allFields[targetColumn] == null && (dialect === null || dialect === void 0 ? void 0 : dialect.generateDefaultValueForUuid);
+        if (shouldGenerateDefaultValue) {
+            return {
+                targetColumn,
+                sql: dialect === null || dialect === void 0 ? void 0 : dialect.generateDefaultValueForUuid,
+                exprType: 'raw',
+            };
+        }
+        return {
+            targetColumn,
+            exprType: 'value',
+            value: allFields[targetColumn],
+            dataType: (_b = (_a = table === null || table === void 0 ? void 0 : table.columns) === null || _a === void 0 ? void 0 : _a.find(x => x.columnName == targetColumn)) === null || _b === void 0 ? void 0 : _b.dataType,
+        };
+    }
     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: allFields[targetColumn],
-    }));
+    const columnNames = Object.keys(allFields);
+    if ((dialect === null || dialect === void 0 ? void 0 : dialect.generateDefaultValueForUuid) && table) {
+        columnNames.push(...table.columns.map(i => i.columnName));
+    }
+    return lodash_1.default.uniq(columnNames)
+        .filter(targetColumn => allowNulls ||
+        allFields[targetColumn] != null ||
+        (isUuidColumn(targetColumn) && (dialect === null || dialect === void 0 ? void 0 : dialect.generateDefaultValueForUuid)))
+        .map(targetColumn => createUpdateField(targetColumn));
 }
-function changeSetInsertToSql(item, dbinfo = null) {
+function changeSetInsertToSql(item, dbinfo = null, dialect = null) {
     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));
+    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), table, dialect);
     if (fields.length == 0)
         return null;
     let autoInc = false;
     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;
         }
@@ -194,19 +216,23 @@ function changeSetInsertToSql(item, dbinfo = null) {
             : null,
     ];
 }
-function extractChangeSetCondition(item, alias) {
+function extractChangeSetCondition(item, alias, table, dialect) {
     function getColumnCondition(columnName) {
+        var _a, _b;
+        const dataType = (_b = (_a = table === null || table === void 0 ? void 0 : table.columns) === null || _a === void 0 ? void 0 : _a.find(x => x.columnName == columnName)) === null || _b === void 0 ? void 0 : _b.dataType;
         const value = item.condition[columnName];
         const expr = {
             exprType: 'column',
             columnName,
-            source: {
-                name: {
-                    pureName: item.pureName,
-                    schemaName: item.schemaName,
+            source: (dialect === null || dialect === void 0 ? void 0 : dialect.omitTableBeforeColumn)
+                ? undefined
+                : {
+                    name: {
+                        pureName: item.pureName,
+                        schemaName: item.schemaName,
+                    },
+                    alias,
                 },
-                alias,
-            },
         };
         if (value == null) {
             return {
@@ -221,6 +247,7 @@ function extractChangeSetCondition(item, alias) {
                 left: expr,
                 right: {
                     exprType: 'value',
+                    dataType,
                     value,
                 },
             };
@@ -262,7 +289,7 @@ function compileSimpleChangeSetCondition(fields) {
         conditions: lodash_1.default.keys(fields).map(columnName => getColumnCondition(columnName)),
     };
 }
-function changeSetUpdateToSql(item, dbinfo = null) {
+function changeSetUpdateToSql(item, dbinfo = null, dialect = 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);
@@ -274,11 +301,13 @@ function changeSetUpdateToSql(item, dbinfo = null) {
             },
         },
         commandType: 'update',
-        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),
+        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)), table),
+        where: extractChangeSetCondition(item, undefined, table, dialect),
     };
 }
-function changeSetDeleteToSql(item) {
+function changeSetDeleteToSql(item, dbinfo = null, dialect = null) {
+    var _a;
+    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);
     return {
         from: {
             name: {
@@ -287,14 +316,14 @@ function changeSetDeleteToSql(item) {
             },
         },
         commandType: 'delete',
-        where: extractChangeSetCondition(item),
+        where: extractChangeSetCondition(item, undefined, table, dialect),
     };
 }
-function changeSetToSql(changeSet, dbinfo) {
+function changeSetToSql(changeSet, dbinfo, dialect) {
     return lodash_1.default.compact(lodash_1.default.flatten([
-        ...changeSet.inserts.map(item => changeSetInsertToSql(item, dbinfo)),
-        ...changeSet.updates.map(item => changeSetUpdateToSql(item, dbinfo)),
-        ...changeSet.deletes.map(changeSetDeleteToSql),
+        ...changeSet.inserts.map(item => changeSetInsertToSql(item, dbinfo, dialect)),
+        ...changeSet.updates.map(item => changeSetUpdateToSql(item, dbinfo, dialect)),
+        ...changeSet.deletes.map(item => changeSetDeleteToSql(item, dbinfo, dialect)),
     ]));
 }
 exports.changeSetToSql = changeSetToSql;

package/lib/GridDisplay.d.ts

@@ -115,6 +115,7 @@ export declare abstract class GridDisplay {
     createSelectBase(name: NamedObjectInfo, columns: ColumnInfo[], options: any, defaultOrderColumnName?: string): Select;
     getRowNumberOverSelect(select: Select, offset: number, count: number): Select;
     getPageQuery(offset: number, count: number): Select;
+    getPageQueryText(offset: number, count: number): string;
     getExportQuery(postprocessSelect?: any): string;
     getExportQueryJson(postprocessSelect?: any): Select;
     getExportColumnMap(): {

package/lib/GridDisplay.js

@@ -161,7 +161,7 @@ class GridDisplay {
                     if (condition) {
                         orCondition.conditions.push(lodash_1.default.cloneDeepWith(condition, (expr) => {
                             if (expr.exprType == 'placeholder') {
-                                return this.createColumnExpression(column, { alias: 'basetbl' }, undefined, 'filter');
+                                return this.createColumnExpression(column, !this.dialect.omitTableAliases ? { alias: 'basetbl' } : undefined, undefined, 'filter');
                             }
                         }));
                     }
@@ -408,7 +408,7 @@ class GridDisplay {
                 return expr;
             }
         }
-        return Object.assign({ exprType: 'column', alias: alias || col.columnName, source }, col);
+        return Object.assign(Object.assign(Object.assign({ exprType: 'column' }, (!this.dialect.omitTableAliases && { alias: alias || col.columnName })), { source }), col);
     }
     createSelectBase(name, columns, options, defaultOrderColumnName) {
         var _a, _b;
@@ -417,11 +417,8 @@ class GridDisplay {
         const orderColumnName = defaultOrderColumnName !== null && defaultOrderColumnName !== void 0 ? defaultOrderColumnName : (_a = columns[0]) === null || _a === void 0 ? void 0 : _a.columnName;
         const select = {
             commandType: 'select',
-            from: {
-                name: lodash_1.default.pick(name, ['schemaName', 'pureName']),
-                alias: 'basetbl',
-            },
-            columns: columns.map(col => this.createColumnExpression(col, { alias: 'basetbl' }, undefined, 'view')),
+            from: Object.assign({ name: lodash_1.default.pick(name, ['schemaName', 'pureName']) }, (!this.dialect.omitTableAliases && { alias: 'basetbl' })),
+            columns: columns.map(col => this.createColumnExpression(col, !this.dialect.omitTableAliases ? { alias: 'basetbl' } : undefined, undefined, 'view')),
             orderBy: ((_b = this.driver) === null || _b === void 0 ? void 0 : _b.requiresDefaultSortCriteria)
                 ? [
                     {
@@ -432,7 +429,7 @@ class GridDisplay {
                 ]
                 : null,
         };
-        const displayedColumnInfo = lodash_1.default.keyBy(this.columns.map(col => (Object.assign(Object.assign({}, col), { sourceAlias: 'basetbl' }))), 'uniqueName');
+        const displayedColumnInfo = lodash_1.default.keyBy(this.columns.map(col => (Object.assign(Object.assign({}, col), (!this.dialect.omitTableAliases && { sourceAlias: 'basetbl' })))), 'uniqueName');
         this.processReferences(select, displayedColumnInfo, options);
         this.applyFilterOnSelect(select, displayedColumnInfo);
         this.applyGroupOnSelect(select, displayedColumnInfo);
@@ -454,7 +451,7 @@ class GridDisplay {
                             ? x
                             : x.source
                                 ? x
-                                : Object.assign(Object.assign({}, x), { source: { alias: 'basetbl' } }))
+                                : Object.assign(Object.assign({}, x), (!this.dialect.omitTableAliases && { source: { alias: 'basetbl' } })))
                         : [
                             Object.assign(Object.assign({}, select.columns[0]), { direction: 'ASC' }),
                         ],
@@ -505,6 +502,11 @@ class GridDisplay {
         // const sql = treeToSql(this.driver, select, dumpSqlSelect);
         // return sql;
     }
+    getPageQueryText(offset, count) {
+        const select = this.getPageQuery(offset, count);
+        const sql = (0, dbgate_sqltree_1.treeToSql)(this.driver, select, dbgate_sqltree_1.dumpSqlSelect);
+        return sql;
+    }
     getExportQuery(postprocessSelect = null) {
         const select = this.createSelect({ isExport: true });
         if (!select)

package/lib/PerspectiveTreeNode.d.ts

@@ -57,6 +57,7 @@ export declare abstract class PerspectiveTreeNode {
     get customJoinConfig(): PerspectiveCustomJoinConfig;
     get db(): DatabaseInfo;
     get isCircular(): boolean;
+    get pathIdentifier(): any;
     hasDesignerIdInIncestors(designerId: string): boolean;
     getChildMatchColumns(): any[];
     getParentMatchColumns(): any[];

package/lib/PerspectiveTreeNode.js

@@ -182,6 +182,11 @@ class PerspectiveTreeNode {
     get isCircular() {
         return false;
     }
+    get pathIdentifier() {
+        if (this.parentNode)
+            return `${this.parentNode.pathIdentifier}_${this.codeName}`;
+        return this.codeName;
+    }
     hasDesignerIdInIncestors(designerId) {
         var _a;
         if (designerId == this.designerId)

package/lib/TableGridDisplay.js

@@ -77,6 +77,7 @@ class TableGridDisplay extends GridDisplay_1.GridDisplay {
         }
     }
     addReferenceToSelect(select, parentAlias, column) {
+        var _a, _b, _c, _d, _e, _f, _g;
         const childAlias = `${column.uniqueName}_ref`;
         if ((select.from.relations || []).find(x => x.alias == childAlias))
             return;
@@ -99,7 +100,7 @@ class TableGridDisplay extends GridDisplay_1.GridDisplay {
                             },
                             right: {
                                 exprType: 'column',
-                                columnName: table.primaryKey.columns[0].columnName,
+                                columnName: (_d = (_c = (_b = (_a = column.foreignKey) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.refColumnName) !== null && _d !== void 0 ? _d : (_g = (_f = (_e = table.primaryKey) === null || _e === void 0 ? void 0 : _e.columns) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.columnName,
                                 source: { name: table, alias: childAlias },
                             },
                         },

package/package.json

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