dbgate-tools 5.5.4-alpha.2 → 5.5.4-alpha.4

package/lib/DatabaseAnalyser.js

@@ -19,6 +19,7 @@ const pick_1 = __importDefault(require("lodash/pick"));
 const compact_1 = __importDefault(require("lodash/compact"));
 const getLogger_1 = require("./getLogger");
 const schemaInfoTools_1 = require("./schemaInfoTools");
+const stringTools_1 = require("./stringTools");
 const logger = (0, getLogger_1.getLogger)('dbAnalyser');
 const STRUCTURE_FIELDS = ['tables', 'collections', 'views', 'matviews', 'functions', 'procedures', 'triggers'];
 const fp_pick = arg => array => (0, pick_1.default)(array, arg);
@@ -319,7 +320,7 @@ class DatabaseAnalyser {
                 return res;
             }
             catch (err) {
-                logger.error({ err, message: err.message, template }, 'Error running analyser query');
+                logger.error((0, stringTools_1.extractErrorLogData)(err, { template }), 'Error running analyser query');
                 return {
                     rows: [],
                 };

package/lib/SqlGenerator.js

@@ -17,6 +17,7 @@ const flatten_1 = __importDefault(require("lodash/flatten"));
 const uniqBy_1 = __importDefault(require("lodash/uniqBy"));
 const getLogger_1 = require("./getLogger");
 const structureTools_1 = require("./structureTools");
+const stringTools_1 = require("./stringTools");
 const logger = (0, getLogger_1.getLogger)('sqlGenerator');
 class SqlGenerator {
     constructor(dbinfo, options, objects, dmp, driver, pool) {
@@ -28,7 +29,7 @@ class SqlGenerator {
         this.isTruncated = false;
         this.isUnhandledException = false;
         this.handleException = error => {
-            logger.error({ error }, 'Unhandled error');
+            logger.error((0, stringTools_1.extractErrorLogData)(error), 'Unhandled error');
             this.isUnhandledException = true;
         };
         this.dbinfo = (0, structureTools_1.extendDatabaseInfo)(dbinfo);

package/lib/stringTools.d.ts

@@ -24,3 +24,8 @@ export declare function getConvertValueMenu(value: any, onSetValue: any, editorT
     text: string;
     onClick: () => any;
 }[];
+export declare function extractErrorMessage(err: any, defaultMessage?: string): any;
+export declare function extractErrorLogData(err: any, additionalFields?: {}): {
+    errorMessage: any;
+    errorObject: any;
+};

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.getConvertValueMenu = exports.detectTypeIcon = exports.detectCellDataType = exports.parseSqlDefaultValue = exports.getAsImageSrc = exports.arrayBufferToBase64 = exports.isWktGeometry = exports.getIconForRedisType = exports.isJsonLikeLongString = exports.shouldOpenMultilineDialog = exports.safeJsonParse = exports.stringifyCellValue = exports.parseCellValue = exports.hexStringToArray = exports.arrayToHexString = void 0;
+exports.extractErrorLogData = exports.extractErrorMessage = exports.getConvertValueMenu = exports.detectTypeIcon = exports.detectCellDataType = exports.parseSqlDefaultValue = exports.getAsImageSrc = exports.arrayBufferToBase64 = exports.isWktGeometry = exports.getIconForRedisType = exports.isJsonLikeLongString = exports.shouldOpenMultilineDialog = exports.safeJsonParse = exports.stringifyCellValue = exports.parseCellValue = exports.hexStringToArray = exports.arrayToHexString = void 0;
 const isString_1 = __importDefault(require("lodash/isString"));
 const isArray_1 = __importDefault(require("lodash/isArray"));
 const isNumber_1 = __importDefault(require("lodash/isNumber"));
@@ -442,3 +442,29 @@ function getConvertValueMenu(value, onSetValue, editorTypes) {
     ];
 }
 exports.getConvertValueMenu = getConvertValueMenu;
+function extractErrorMessage(err, defaultMessage = 'Unknown error') {
+    if (!err) {
+        return defaultMessage;
+    }
+    if ((0, isArray_1.default)(err.errors)) {
+        try {
+            return err.errors.map(x => x.message).join('\n');
+        }
+        catch (e2) { }
+    }
+    if (err.message) {
+        return err.message;
+    }
+    const s = `${err}`;
+    if (s && (!s.endsWith('Error') || s.includes(' '))) {
+        return s;
+    }
+    return defaultMessage;
+}
+exports.extractErrorMessage = extractErrorMessage;
+function extractErrorLogData(err, additionalFields = {}) {
+    if (!err)
+        return null;
+    return Object.assign({ errorMessage: extractErrorMessage(err), errorObject: err }, additionalFields);
+}
+exports.extractErrorLogData = extractErrorLogData;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.5.4-alpha.2",
+  "version": "5.5.4-alpha.4",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -25,14 +25,14 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^5.5.4-alpha.2",
+    "dbgate-types": "^5.5.4-alpha.4",
     "jest": "^24.9.0",
     "ts-jest": "^25.2.1",
     "typescript": "^4.4.3"
   },
   "dependencies": {
     "dbgate-query-splitter": "^4.10.5",
-    "dbgate-sqltree": "^5.5.4-alpha.2",
+    "dbgate-sqltree": "^5.5.4-alpha.4",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",