dbgate-tools 6.6.3 → 6.6.4

package/lib/DatabaseAnalyser.d.ts

@@ -9,12 +9,16 @@ export declare class DatabaseAnalyser<TClient = any> {
     singleObjectId: string;
     dialect: SqlDialect;
     logger: Logger;
+    startedTm: number;
+    analyseIdentifier: string;
     constructor(dbhan: DatabaseHandle<TClient>, driver: EngineDriver, version: any);
     _runAnalysis(): Promise<DatabaseInfo>;
     _getFastSnapshot(): Promise<DatabaseInfo>;
     _computeSingleObjectId(): Promise<void>;
     addEngineField(db: DatabaseInfo): DatabaseInfo;
     getLogDbInfo(): {
+        analyserTime: number;
+        analyseIdentifier: string;
         database?: string;
         engine: string;
         conid?: string;

package/lib/DatabaseAnalyser.js

@@ -49,6 +49,8 @@ class DatabaseAnalyser {
         this.dbhan = dbhan;
         this.driver = driver;
         this.singleObjectId = null;
+        this.startedTm = Date.now();
+        this.analyseIdentifier = Math.random().toString().substring(2);
         this.dialect = ((driver === null || driver === void 0 ? void 0 : driver.dialectByVersion) && (driver === null || driver === void 0 ? void 0 : driver.dialectByVersion(version))) || (driver === null || driver === void 0 ? void 0 : driver.dialect);
         this.logger = logger;
     }
@@ -74,13 +76,24 @@ class DatabaseAnalyser {
         return db;
     }
     getLogDbInfo() {
-        return this.driver.getLogDbInfo(this.dbhan);
+        return {
+            ...this.driver.getLogDbInfo(this.dbhan),
+            analyserTime: Date.now() - this.startedTm,
+            analyseIdentifier: this.analyseIdentifier,
+        };
     }
     async fullAnalysis() {
         logger.debug(this.getLogDbInfo(), 'DBGM-00126 Performing full analysis');
-        const res = this.addEngineField(await this._runAnalysis());
+        try {
+            const res = this.addEngineField(await this._runAnalysis());
+            logger.debug(this.getLogDbInfo(), 'DBGM-00271 Full analysis finished successfully');
+            return res;
+        }
+        catch (err) {
+            logger.error((0, stringTools_1.extractErrorLogData)(err, this.getLogDbInfo()), 'DBGM-00272 Error during full analysis');
+            throw err;
+        }
         // console.log('FULL ANALYSIS', res);
-        return res;
     }
     async singleObjectAnalysis(name, typeField) {
         var _a, _b, _c;
@@ -98,29 +111,36 @@ class DatabaseAnalyser {
     async incrementalAnalysis(structure) {
         logger.info(this.getLogDbInfo(), 'DBGM-00127 Performing incremental analysis');
         this.structure = structure;
-        const modifications = await this.getModifications();
-        if (modifications == null) {
-            // modifications not implemented, perform full analysis
-            this.structure = null;
-            return this.addEngineField(await this._runAnalysis());
-        }
-        const structureModifications = modifications.filter(x => x.action != 'setTableRowCounts');
-        const setTableRowCounts = modifications.find(x => x.action == 'setTableRowCounts');
-        let structureWithRowCounts = null;
-        if (setTableRowCounts) {
-            const newStructure = mergeTableRowCounts(structure, setTableRowCounts.rowCounts);
-            if (areDifferentRowCounts(structure, newStructure)) {
-                structureWithRowCounts = newStructure;
+        try {
+            const modifications = await this.getModifications();
+            if (modifications == null) {
+                // modifications not implemented, perform full analysis
+                this.structure = null;
+                return this.addEngineField(await this._runAnalysis());
             }
+            const structureModifications = modifications.filter(x => x.action != 'setTableRowCounts');
+            const setTableRowCounts = modifications.find(x => x.action == 'setTableRowCounts');
+            let structureWithRowCounts = null;
+            if (setTableRowCounts) {
+                const newStructure = mergeTableRowCounts(structure, setTableRowCounts.rowCounts);
+                if (areDifferentRowCounts(structure, newStructure)) {
+                    structureWithRowCounts = newStructure;
+                }
+            }
+            if (structureModifications.length == 0) {
+                logger.debug(this.getLogDbInfo(), 'DBGM-00267 No changes in database structure detected');
+                return structureWithRowCounts ? this.addEngineField(structureWithRowCounts) : null;
+            }
+            this.modifications = structureModifications;
+            if (structureWithRowCounts)
+                this.structure = structureWithRowCounts;
+            logger.info({ ...this.getLogDbInfo(), modifications: this.modifications }, 'DBGM-00128 DB modifications detected');
+            return this.addEngineField(this.mergeAnalyseResult(await this._runAnalysis()));
         }
-        if (structureModifications.length == 0) {
-            return structureWithRowCounts ? this.addEngineField(structureWithRowCounts) : null;
+        catch (err) {
+            logger.error((0, stringTools_1.extractErrorLogData)(err, this.getLogDbInfo()), 'DBGM-00273 Error during incremental analysis');
+            throw err;
         }
-        this.modifications = structureModifications;
-        if (structureWithRowCounts)
-            this.structure = structureWithRowCounts;
-        logger.info({ ...this.getLogDbInfo(), modifications: this.modifications }, 'DBGM-00128 DB modifications detected');
-        return this.addEngineField(this.mergeAnalyseResult(await this._runAnalysis()));
     }
     mergeAnalyseResult(newlyAnalysed) {
         if (this.structure == null) {

package/lib/nameTools.d.ts

@@ -24,3 +24,7 @@ export declare function findObjectLike({ pureName, schemaName }: {
 export declare function findForeignKeyForColumn(table: TableInfo, column: ColumnInfo | string): import("dbgate-types").ForeignKeyInfo;
 export declare function makeUniqueColumnNames(res: ColumnInfo[]): void;
 export declare function fillConstraintNames(table: TableInfo, dialect: SqlDialect): TableInfo;
+export declare const DATA_FOLDER_NAMES: {
+    name: string;
+    label: string;
+}[];

package/lib/nameTools.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.fillConstraintNames = exports.makeUniqueColumnNames = exports.findForeignKeyForColumn = exports.findObjectLike = exports.equalFullName = exports.equalStringLike = exports.quoteFullName = exports.fullNameToLabel = exports.fullNameToString = exports.fullNameFromString = void 0;
+exports.DATA_FOLDER_NAMES = exports.fillConstraintNames = exports.makeUniqueColumnNames = exports.findForeignKeyForColumn = exports.findObjectLike = exports.equalFullName = exports.equalStringLike = exports.quoteFullName = exports.fullNameToLabel = exports.fullNameToString = exports.fullNameFromString = void 0;
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const isString_1 = __importDefault(require("lodash/isString"));
 function fullNameFromString(name) {
@@ -110,3 +110,19 @@ function fillConstraintNames(table, dialect) {
     return res;
 }
 exports.fillConstraintNames = fillConstraintNames;
+exports.DATA_FOLDER_NAMES = [
+    { name: 'sql', label: 'SQL scripts' },
+    { name: 'shell', label: 'Shell scripts' },
+    { name: 'markdown', label: 'Markdown files' },
+    { name: 'charts', label: 'Charts' },
+    { name: 'query', label: 'Query designs' },
+    { name: 'sqlite', label: 'SQLite files' },
+    { name: 'duckdb', label: 'DuckDB files' },
+    { name: 'diagrams', label: 'Diagrams' },
+    { name: 'perspectives', label: 'Perspectives' },
+    { name: 'impexp', label: 'Import/Export jobs' },
+    { name: 'modtrans', label: 'Model transforms' },
+    { name: 'datadeploy', label: 'Data deploy jobs' },
+    { name: 'dbcompare', label: 'Database compare jobs' },
+    { name: 'apps', label: 'Applications' },
+];

package/lib/stringTools.d.ts

@@ -48,3 +48,4 @@ export declare function removeSqlFrontMatter(text: string): string;
 export declare function setSqlFrontMatter(text: string, data: {
     [key: string]: any;
 }, yamlModule: any): string;
+export declare function shortenIdentifier(s: string, maxLength?: number): string;

package/lib/stringTools.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.setSqlFrontMatter = exports.removeSqlFrontMatter = exports.getSqlFrontMatter = exports.parseNumberSafe = exports.deserializeJsTypesReviver = exports.serializeJsTypesReplacer = exports.deserializeJsTypesFromJsonParse = exports.serializeJsTypesForJsonStringify = exports.jsonLinesParse = exports.jsonLinesStringify = exports.pinoLogRecordToMessageRecord = exports.getLimitedQuery = exports.safeFormatDate = exports.extractErrorLogData = exports.extractErrorStackTrace = exports.extractErrorMessage = exports.getConvertValueMenu = exports.detectTypeIcon = exports.detectCellDataType = exports.parseSqlDefaultValue = exports.getAsImageSrc = exports.arrayBufferToBase64 = exports.isWktGeometry = exports.getIconForRedisType = exports.isJsonLikeLongString = exports.shouldOpenMultilineDialog = exports.safeCompileRegExp = exports.safeJsonParse = exports.stringifyCellValue = exports.parseCellValue = exports.hexStringToArray = exports.arrayToHexString = exports.MAX_GRID_TEXT_LENGTH = void 0;
+exports.shortenIdentifier = exports.setSqlFrontMatter = exports.removeSqlFrontMatter = exports.getSqlFrontMatter = exports.parseNumberSafe = exports.deserializeJsTypesReviver = exports.serializeJsTypesReplacer = exports.deserializeJsTypesFromJsonParse = exports.serializeJsTypesForJsonStringify = exports.jsonLinesParse = exports.jsonLinesStringify = exports.pinoLogRecordToMessageRecord = exports.getLimitedQuery = exports.safeFormatDate = exports.extractErrorLogData = exports.extractErrorStackTrace = exports.extractErrorMessage = exports.getConvertValueMenu = exports.detectTypeIcon = exports.detectCellDataType = exports.parseSqlDefaultValue = exports.getAsImageSrc = exports.arrayBufferToBase64 = exports.isWktGeometry = exports.getIconForRedisType = exports.isJsonLikeLongString = exports.shouldOpenMultilineDialog = exports.safeCompileRegExp = exports.safeJsonParse = exports.stringifyCellValue = exports.parseCellValue = exports.hexStringToArray = exports.arrayToHexString = exports.MAX_GRID_TEXT_LENGTH = void 0;
 const isString_1 = __importDefault(require("lodash/isString"));
 const isArray_1 = __importDefault(require("lodash/isArray"));
 const isDate_1 = __importDefault(require("lodash/isDate"));
@@ -14,6 +14,7 @@ const cloneDeepWith_1 = __importDefault(require("lodash/cloneDeepWith"));
 const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
 const omitBy_1 = __importDefault(require("lodash/omitBy"));
 const isPlainObject_2 = __importDefault(require("lodash/isPlainObject"));
+const blueimp_md5_1 = __importDefault(require("blueimp-md5"));
 exports.MAX_GRID_TEXT_LENGTH = 1000; // maximum length of text in grid cell, longer text is truncated
 const dateTimeStorageRegex = /^([0-9]+)-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])[Tt]([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(([Zz])|()|([\+|\-]([01][0-9]|2[0-3]):[0-5][0-9]))$/;
 const dateTimeParseRegex = /^(\d{4})-(\d{2})-(\d{2})[Tt ](\d{2}):(\d{2}):(\d{2})(\.[0-9]+)?(([Zz])|()|([\+|\-]([01][0-9]|2[0-3]):[0-5][0-9]))$/;
@@ -344,6 +345,9 @@ function safeJsonParse(json, defaultValue, logError = false) {
     if ((0, isArray_1.default)(json) || (0, isPlainObject_1.default)(json)) {
         return json;
     }
+    if (!json) {
+        return defaultValue;
+    }
     try {
         return JSON.parse(json);
     }
@@ -706,3 +710,14 @@ function setSqlFrontMatter(text, data, yamlModule) {
     return frontMatterContent + (textClean || '');
 }
 exports.setSqlFrontMatter = setSqlFrontMatter;
+function shortenIdentifier(s, maxLength) {
+    if (!maxLength || maxLength < 10)
+        return s;
+    if (s.length <= maxLength)
+        return s;
+    const hash = (0, blueimp_md5_1.default)(s).substring(0, 8);
+    const partLength = Math.floor((maxLength - 9) / 2);
+    const restLength = maxLength - 10 - partLength;
+    return s.substring(0, partLength) + '_' + hash + '_' + s.substring(s.length - restLength);
+}
+exports.shortenIdentifier = shortenIdentifier;

package/lib/testPermission.js

@@ -97,9 +97,25 @@ function getPredefinedPermissions(predefinedRoleName) {
         case 'superadmin':
             return ['*', '~widgets/*', 'widgets/admin', 'widgets/database', '~all-connections'];
         case 'logged-user':
-            return ['*', '~widgets/admin', '~admin/*', '~internal-storage', '~all-connections', '~run-shell-script'];
+            return [
+                '*',
+                '~widgets/admin',
+                '~admin/*',
+                '~internal-storage',
+                '~all-connections',
+                '~run-shell-script',
+                '~all-team-files/*',
+            ];
         case 'anonymous-user':
-            return ['*', '~widgets/admin', '~admin/*', '~internal-storage', '~all-connections', '~run-shell-script'];
+            return [
+                '*',
+                '~widgets/admin',
+                '~admin/*',
+                '~internal-storage',
+                '~all-connections',
+                '~run-shell-script',
+                '~all-team-files/*',
+            ];
         default:
             return null;
     }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.6.3",
+  "version": "6.6.4",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,14 +26,15 @@
   ],
   "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"
   },
   "dependencies": {
-    "dbgate-query-splitter": "^4.11.5",
-    "dbgate-sqltree": "^6.6.3",
+    "blueimp-md5": "^2.19.0",
+    "dbgate-query-splitter": "^4.11.7",
+    "dbgate-sqltree": "^6.6.4",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",