dbgate-datalib 6.6.3 → 6.6.4

package/lib/GridDisplay.d.ts

@@ -8,6 +8,7 @@ export interface DisplayColumn {
     columnName: string;
     headerText: string;
     uniqueName: string;
+    uniqueNameShorten?: string;
     uniquePath: string[];
     notNull?: boolean;
     autoIncrement?: boolean;

package/lib/GridDisplay.js

@@ -421,7 +421,9 @@ class GridDisplay {
                 return expr;
             }
         }
-        return Object.assign(Object.assign(Object.assign({ exprType: 'column' }, (!this.dialect.omitTableAliases && { alias: alias || col.columnName })), { source }), col);
+        return Object.assign(Object.assign(Object.assign({ exprType: 'column' }, (!this.dialect.omitTableAliases && {
+            alias: alias !== null && alias !== void 0 ? alias : col.columnName,
+        })), { source }), col);
     }
     createSelectBase(name, columns, options, defaultOrderColumnName) {
         var _a, _b;

package/lib/TableGridDisplay.d.ts

@@ -23,43 +23,7 @@ export declare class TableGridDisplay extends GridDisplay {
         schemaName?: any;
         pureName: any;
     }): TableInfo;
-    getDisplayColumns(table: TableInfo, parentPath: string[]): {
-        isChecked: boolean;
-        hintColumnNames: string[];
-        hintColumnDelimiter: string;
-        isExpandable: boolean;
-        pureName: string;
-        schemaName: string;
-        headerText: string;
-        uniqueName: string;
-        uniquePath: string[];
-        isPrimaryKey: boolean;
-        hasAutoValue: boolean;
-        foreignKey: ForeignKeyInfo;
-        isForeignKeyUnique: boolean;
-        pairingId?: string;
-        columnName: string;
-        notNull?: boolean;
-        autoIncrement?: boolean;
-        dataType: string;
-        displayedDataType?: string;
-        precision?: number;
-        scale?: number;
-        length?: number;
-        computedExpression?: string;
-        isPersisted?: boolean;
-        isSparse?: boolean;
-        defaultValue?: string;
-        defaultConstraint?: string;
-        columnComment?: string;
-        isUnsigned?: boolean;
-        isZerofill?: boolean;
-        options?: [];
-        canSelectMultipleOptions?: boolean;
-        undropColumnName?: string;
-        contentHash?: string;
-        engine?: string;
-    }[];
+    getDisplayColumns(table: TableInfo, parentPath: string[]): DisplayColumn[];
     addJoinsFromExpandedColumns(select: Select, columns: DisplayColumn[], parentAlias: string, columnSources: any): void;
     addReferenceToSelect(select: Select, parentAlias: string, column: DisplayColumn): void;
     getFkDictionaryDescription(foreignKey: ForeignKeyInfo): DictionaryDescription;

package/lib/TableGridDisplay.js

@@ -60,7 +60,7 @@ class TableGridDisplay extends GridDisplay_1.GridDisplay {
         var _a, _b;
         return (((_b = (_a = table === null || table === void 0 ? void 0 : table.columns) === null || _a === void 0 ? void 0 : _a.map(col => this.getDisplayColumn(table, col, parentPath))) === null || _b === void 0 ? void 0 : _b.map(col => {
             var _a, _b, _c;
-            return (Object.assign(Object.assign({}, col), { isChecked: this.isColumnChecked(col), hintColumnNames: ((_b = (_a = this.getFkDictionaryDescription(col.isForeignKeyUnique ? col.foreignKey : null)) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.map(columnName => `hint_${col.uniqueName}_${columnName}`)) || null, hintColumnDelimiter: (_c = this.getFkDictionaryDescription(col.isForeignKeyUnique ? col.foreignKey : null)) === null || _c === void 0 ? void 0 : _c.delimiter, isExpandable: !!col.foreignKey }));
+            return (Object.assign(Object.assign({}, col), { isChecked: this.isColumnChecked(col), hintColumnNames: ((_b = (_a = this.getFkDictionaryDescription(col.isForeignKeyUnique ? col.foreignKey : null)) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.map(columnName => (0, dbgate_tools_1.shortenIdentifier)(`hint_${col.uniqueName}_${columnName}`, this.driver.dialect.maxIdentifierLength))) || null, hintColumnDelimiter: (_c = this.getFkDictionaryDescription(col.isForeignKeyUnique ? col.foreignKey : null)) === null || _c === void 0 ? void 0 : _c.delimiter, uniqueNameShorten: (0, dbgate_tools_1.shortenIdentifier)(col.uniqueName, this.driver.dialect.maxIdentifierLength), isExpandable: !!col.foreignKey }));
         })) || []);
     }
     addJoinsFromExpandedColumns(select, columns, parentAlias, columnSources) {
@@ -68,7 +68,7 @@ class TableGridDisplay extends GridDisplay_1.GridDisplay {
             if (this.isExpandedColumn(column.uniqueName)) {
                 const table = this.getFkTarget(column);
                 if (table) {
-                    const childAlias = `${column.uniqueName}_ref`;
+                    const childAlias = (0, dbgate_tools_1.shortenIdentifier)(`${column.uniqueName}_ref`, this.driver.dialect.maxIdentifierLength);
                     const subcolumns = this.getDisplayColumns(table, column.uniquePath);
                     this.addReferenceToSelect(select, parentAlias, column);
                     this.addJoinsFromExpandedColumns(select, subcolumns, childAlias, columnSources);
@@ -79,7 +79,7 @@ class TableGridDisplay extends GridDisplay_1.GridDisplay {
     }
     addReferenceToSelect(select, parentAlias, column) {
         var _a, _b, _c, _d, _e, _f, _g;
-        const childAlias = `${column.uniqueName}_ref`;
+        const childAlias = (0, dbgate_tools_1.shortenIdentifier)(`${column.uniqueName}_ref`, this.driver.dialect.maxIdentifierLength);
         if ((select.from.relations || []).find(x => x.alias == childAlias))
             return;
         const table = this.getFkTarget(column);
@@ -139,12 +139,14 @@ class TableGridDisplay extends GridDisplay_1.GridDisplay {
                     const hintDescription = this.getDictionaryDescription(table);
                     if (hintDescription) {
                         const parentUniqueName = column.uniquePath.slice(0, -1).join('.');
-                        this.addReferenceToSelect(select, parentUniqueName ? `${parentUniqueName}_ref` : 'basetbl', column);
-                        const childAlias = `${column.uniqueName}_ref`;
+                        this.addReferenceToSelect(select, parentUniqueName
+                            ? (0, dbgate_tools_1.shortenIdentifier)(`${parentUniqueName}_ref`, this.driver.dialect.maxIdentifierLength)
+                            : 'basetbl', column);
+                        const childAlias = (0, dbgate_tools_1.shortenIdentifier)(`${column.uniqueName}_ref`, this.driver.dialect.maxIdentifierLength);
                         select.columns.push(...hintDescription.columns.map(columnName => ({
                             exprType: 'column',
                             columnName,
-                            alias: `hint_${column.uniqueName}_${columnName}`,
+                            alias: (0, dbgate_tools_1.shortenIdentifier)(`hint_${column.uniqueName}_${columnName}`, this.driver.dialect.maxIdentifierLength),
                             source: { alias: childAlias },
                         })));
                         res = true;
@@ -171,7 +173,7 @@ class TableGridDisplay extends GridDisplay_1.GridDisplay {
         return [];
     }
     getFkTarget(column) {
-        const { uniqueName, foreignKey, isForeignKeyUnique } = column;
+        const { foreignKey, isForeignKeyUnique } = column;
         if (!isForeignKeyUnique)
             return null;
         const pureName = foreignKey.refTableName;
@@ -211,9 +213,10 @@ class TableGridDisplay extends GridDisplay_1.GridDisplay {
         return res;
     }
     addAddedColumnsToSelect(select, columns, parentAlias, displayedColumnInfo) {
+        var _a;
         for (const column of columns) {
             if (this.addAllExpandedColumnsToSelected || this.config.addedColumns.includes(column.uniqueName)) {
-                select.columns.push(this.createColumnExpression(column, { name: column, alias: parentAlias }, column.uniqueName, 'view'));
+                select.columns.push(this.createColumnExpression(column, { name: column, alias: parentAlias }, (_a = column.uniqueNameShorten) !== null && _a !== void 0 ? _a : column.uniqueName, 'view'));
                 displayedColumnInfo[column.uniqueName] = Object.assign(Object.assign({}, column), { sourceAlias: parentAlias });
             }
         }

package/lib/chartDefinitions.d.ts

@@ -1,5 +1,5 @@
 export type ChartTypeEnum = 'bar' | 'line' | 'timeline' | 'pie' | 'polarArea';
-export type ChartXTransformFunction = 'identity' | 'date:minute' | 'date:hour' | 'date:day' | 'date:month' | 'date:year';
+export type ChartXTransformFunction = 'identity' | 'date:minute' | 'date:hour' | 'date:day' | 'date:week' | 'date:month' | 'date:year';
 export type ChartYAggregateFunction = 'sum' | 'first' | 'last' | 'min' | 'max' | 'count' | 'avg';
 export type ChartDataLabelFormatter = 'number' | 'size:bytes' | 'size:kb' | 'size:mb' | 'size:gb';
 export declare const ChartConstDefaults: {
@@ -56,6 +56,7 @@ export interface ChartDateParsed {
     minute?: number;
     second?: number;
     fraction?: string;
+    week?: number;
 }
 export interface ChartAvailableColumn {
     field: string;

package/lib/chartTools.js

@@ -26,6 +26,7 @@ function tryParseChartDate(dateInput) {
         return {
             year: dateInput.getFullYear(),
             month: dateInput.getMonth() + 1,
+            week: (0, date_fns_1.getWeek)(dateInput),
             day: dateInput.getDate(),
             hour: dateInput.getHours(),
             minute: dateInput.getMinutes(),
@@ -37,13 +38,18 @@ function tryParseChartDate(dateInput) {
         return null;
     const dateMatch = dateInput.match(/^(\d{4})-(\d{2})-(\d{2})(?:[ T](\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?(Z|[+-]\d{2}:\d{2})?)?$/);
     const monthMatch = dateInput.match(/^(\d{4})-(\d{2})$/);
+    const weekMatch = dateInput.match(/^(\d{4})\@(\d{2})$/);
     // const yearMatch = dateInput.match(/^(\d{4})$/);
     if (dateMatch) {
-        const [_notUsed, year, month, day, hour, minute, second, fraction] = dateMatch;
+        const [_notUsed, yearStr, monthStr, dayStr, hour, minute, second, fraction] = dateMatch;
+        const year = parseInt(yearStr, 10);
+        const month = parseInt(monthStr, 10);
+        const day = parseInt(dayStr, 10);
         return {
-            year: parseInt(year, 10),
-            month: parseInt(month, 10),
-            day: parseInt(day, 10),
+            year,
+            month,
+            week: (0, date_fns_1.getWeek)(new Date(year, month - 1, day)),
+            day,
             hour: parseInt(hour, 10) || 0,
             minute: parseInt(minute, 10) || 0,
             second: parseInt(second, 10) || 0,
@@ -62,6 +68,18 @@ function tryParseChartDate(dateInput) {
             fraction: undefined,
         };
     }
+    if (weekMatch) {
+        const [_notUsed, year, week] = weekMatch;
+        return {
+            year: parseInt(year, 10),
+            week: parseInt(week, 10),
+            day: 1,
+            hour: 0,
+            minute: 0,
+            second: 0,
+            fraction: undefined,
+        };
+    }
     // if (yearMatch) {
     //   const [_notUsed, year] = yearMatch;
     //   return {
@@ -81,11 +99,14 @@ function pad2Digits(number) {
     return ('00' + number).slice(-2);
 }
 function stringifyChartDate(value, transform) {
+    var _a, _b;
     switch (transform) {
         case 'date:year':
             return `${value.year}`;
         case 'date:month':
             return `${value.year}-${pad2Digits(value.month)}`;
+        case 'date:week':
+            return `${value.year}@${pad2Digits((0, date_fns_1.getWeek)(new Date(value.year, ((_a = value.month) !== null && _a !== void 0 ? _a : 1) - 1, (_b = value.day) !== null && _b !== void 0 ? _b : 1)))}`;
         case 'date:day':
             return `${value.year}-${pad2Digits(value.month)}-${pad2Digits(value.day)}`;
         case 'date:hour':
@@ -108,6 +129,9 @@ function incrementChartDate(value, transform) {
         case 'date:month':
             newDateRepresentation = (0, date_fns_1.addMonths)(dateRepresentation, 1);
             break;
+        case 'date:week':
+            newDateRepresentation = (0, date_fns_1.addWeeks)(dateRepresentation, 1);
+            break;
         case 'date:day':
             newDateRepresentation = (0, date_fns_1.addDays)(dateRepresentation, 1);
             break;
@@ -126,6 +150,11 @@ function incrementChartDate(value, transform) {
                 year: newDateRepresentation.getFullYear(),
                 month: newDateRepresentation.getMonth() + 1,
             };
+        case 'date:week':
+            return {
+                year: newDateRepresentation.getFullYear(),
+                week: (0, date_fns_1.getWeek)(newDateRepresentation),
+            };
         case 'date:day':
             return {
                 year: newDateRepresentation.getFullYear(),
@@ -157,6 +186,8 @@ function runTransformFunction(value, transformFunction) {
             return dateParsed ? `${dateParsed.year}` : null;
         case 'date:month':
             return dateParsed ? `${dateParsed.year}-${pad2Digits(dateParsed.month)}` : null;
+        case 'date:week':
+            return dateParsed ? `${dateParsed.year}@${pad2Digits(dateParsed.week)}` : null;
         case 'date:day':
             return dateParsed ? `${dateParsed.year}-${pad2Digits(dateParsed.month)}-${pad2Digits(dateParsed.day)}` : null;
         case 'date:hour':
@@ -185,6 +216,14 @@ function computeChartBucketKey(dateParsed, chart, row) {
                     month: dateParsed.month,
                 },
             ];
+        case 'date:week':
+            return [
+                dateParsed ? `${dateParsed.year}@${pad2Digits(dateParsed.week)}` : null,
+                {
+                    year: dateParsed.year,
+                    week: dateParsed.week,
+                },
+            ];
         case 'date:day':
             return [
                 dateParsed ? `${dateParsed.year}-${pad2Digits(dateParsed.month)}-${pad2Digits(dateParsed.day)}` : null,
@@ -231,6 +270,8 @@ function computeDateBucketDistance(begin, end, transform) {
             return end.year - begin.year;
         case 'date:month':
             return (end.year - begin.year) * 12 + (end.month - begin.month);
+        case 'date:week':
+            return (end.year - begin.year) * 52 + (end.week - begin.week);
         case 'date:day':
             return ((end.year - begin.year) * 365 +
                 (end.month - begin.month) * 30 + // rough approximation
@@ -258,6 +299,8 @@ function compareChartDatesParsed(a, b, transform) {
             return a.year - b.year;
         case 'date:month':
             return a.year === b.year ? a.month - b.month : a.year - b.year;
+        case 'date:week':
+            return a.year === b.year ? a.week - b.week : a.year - b.year;
         case 'date:day':
             return a.year === b.year && a.month === b.month
                 ? a.day - b.day
@@ -305,6 +348,8 @@ function getParentDateBucketKey(bucketKey, transform, isGrouped) {
             return null; // no parent for year
         case 'date:month':
             return bucketKey.slice(0, 4);
+        case 'date:week':
+            return bucketKey.slice(0, 4);
         case 'date:day':
             return bucketKey.slice(0, 7);
         case 'date:hour':
@@ -319,6 +364,8 @@ function getParentDateBucketTransform(transform) {
             return null; // no parent for year
         case 'date:month':
             return 'date:year';
+        case 'date:week':
+            return 'date:year';
         case 'date:day':
             return 'date:month';
         case 'date:hour':
@@ -335,6 +382,8 @@ function getParentKeyParsed(date, transform) {
             return null; // no parent for year
         case 'date:month':
             return { year: date.year };
+        case 'date:week':
+            return { year: date.week };
         case 'date:day':
             return { year: date.year, month: date.month };
         case 'date:hour':

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.6.3",
+  "version": "6.6.4",
   "name": "dbgate-datalib",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -15,14 +15,14 @@
   ],
   "dependencies": {
     "date-fns": "^4.1.0",
-    "dbgate-filterparser": "^6.6.3",
-    "dbgate-sqltree": "^6.6.3",
-    "dbgate-tools": "^6.6.3",
+    "dbgate-filterparser": "^6.6.4",
+    "dbgate-sqltree": "^6.6.4",
+    "dbgate-tools": "^6.6.4",
     "uuid": "^3.4.0"
   },
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^6.6.3",
+    "dbgate-types": "^6.6.4",
     "jest": "^28.1.3",
     "ts-jest": "^28.0.7",
     "typescript": "^4.4.3"