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

package/lib/SqlDumper.js

@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqlDumper = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 const isString_1 = __importDefault(require("lodash/isString"));
 const isNumber_1 = __importDefault(require("lodash/isNumber"));
 const isDate_1 = __importDefault(require("lodash/isDate"));
 const isArray_1 = __importDefault(require("lodash/isArray"));
 const isPlainObject_1 = __importDefault(require("lodash/isPlainObject"));
+const keys_1 = __importDefault(require("lodash/keys"));
 const v1_1 = __importDefault(require("uuid/v1"));
 class SqlDumper {
     static convertKeywordCase(keyword) {
@@ -221,7 +221,7 @@ class SqlDumper {
         }
     }
     columnDefinition(column, { includeDefault = true, includeNullable = true, includeCollate = true } = {}) {
-        var _a, _b;
+        var _a, _b, _c;
         if (column.computedExpression) {
             this.put('^as %s', column.computedExpression);
             if (column.isPersisted)
@@ -237,7 +237,7 @@ class SqlDumper {
         if (includeNullable && !((_a = this.dialect) === null || _a === void 0 ? void 0 : _a.specificNullabilityImplementation)) {
             this.put(column.notNull ? '^not ^null' : '^null');
         }
-        if (includeDefault && ((_b = column.defaultValue) === null || _b === void 0 ? void 0 : _b.trim())) {
+        if (includeDefault && ((_c = (_b = column.defaultValue) === null || _b === void 0 ? void 0 : _b.toString()) === null || _c === void 0 ? void 0 : _c.trim())) {
             this.columnDefault(column);
         }
     }
@@ -634,7 +634,7 @@ class SqlDumper {
         let was = false;
         for (const row of newRows) {
             const old = oldRows === null || oldRows === void 0 ? void 0 : oldRows.find(r => key.every(col => r[col] == row[col]));
-            const rowKeys = lodash_1.default.keys(row);
+            const rowKeys = (0, keys_1.default)(row);
             if (old) {
                 const updated = [];
                 for (const col of rowKeys) {

package/lib/stringTools.d.ts

@@ -25,7 +25,9 @@ export declare function getConvertValueMenu(value: any, onSetValue: any, editorT
     onClick: () => any;
 }[];
 export declare function extractErrorMessage(err: any, defaultMessage?: string): any;
+export declare function extractErrorStackTrace(err: any): string;
 export declare function extractErrorLogData(err: any, additionalFields?: {}): {
     errorMessage: any;
     errorObject: any;
+    errorStack: 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.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;
+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.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"));
@@ -462,9 +462,18 @@ function extractErrorMessage(err, defaultMessage = 'Unknown error') {
     return defaultMessage;
 }
 exports.extractErrorMessage = extractErrorMessage;
+function extractErrorStackTrace(err) {
+    const { stack } = err;
+    if (!(0, isString_1.default)(stack))
+        return undefined;
+    if (stack.length > 1000)
+        return stack.substring(0, 1000) + '... (truncated)';
+    return stack;
+}
+exports.extractErrorStackTrace = extractErrorStackTrace;
 function extractErrorLogData(err, additionalFields = {}) {
     if (!err)
         return null;
-    return Object.assign({ errorMessage: extractErrorMessage(err), errorObject: err }, additionalFields);
+    return Object.assign({ errorMessage: extractErrorMessage(err), errorObject: err, errorStack: extractErrorStackTrace(err) }, additionalFields);
 }
 exports.extractErrorLogData = extractErrorLogData;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.5.4-alpha.4",
+  "version": "5.5.4-alpha.8",
   "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.4",
+    "dbgate-types": "^5.5.4-alpha.8",
     "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.4",
+    "dbgate-sqltree": "^5.5.4-alpha.8",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",