dbgate-tools 5.5.4-alpha.7 → 5.5.4

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

@@ -31,3 +31,4 @@ export declare function extractErrorLogData(err: any, additionalFields?: {}): {
     errorObject: any;
     errorStack: string;
 };
+export declare function safeFormatDate(date: any): any;

package/lib/stringTools.js

@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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.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 isDate_1 = __importDefault(require("lodash/isDate"));
 const isNumber_1 = __importDefault(require("lodash/isNumber"));
 const isPlainObject_1 = __importDefault(require("lodash/isPlainObject"));
 const pad_1 = __importDefault(require("lodash/pad"));
@@ -179,17 +180,18 @@ function stringifyCellValue(value, intent, editorTypes, gridFormattingOptions, j
     }
     if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseDateAsDollar) {
         if (value === null || value === void 0 ? void 0 : value.$date) {
+            const dateString = (0, isDate_1.default)(value.$date) ? value.$date.toISOString() : value.$date.toString();
             switch (intent) {
                 case 'exportIntent':
                 case 'stringConversionIntent':
-                    return { value: value.$date };
+                    return { value: dateString };
                 default:
-                    const m = value.$date.match(dateTimeStorageRegex);
+                    const m = dateString.match(dateTimeStorageRegex);
                     if (m) {
                         return { value: `${m[1]}-${m[2]}-${m[3]} ${m[4]}:${m[5]}:${m[6]}`, gridStyle: 'valueCellStyle' };
                     }
                     else {
-                        return { value: value.$date.replaCE('T', ' '), gridStyle: 'valueCellStyle' };
+                        return { value: dateString.replace('T', ' '), gridStyle: 'valueCellStyle' };
                     }
             }
         }
@@ -477,3 +479,13 @@ function extractErrorLogData(err, additionalFields = {}) {
     return Object.assign({ errorMessage: extractErrorMessage(err), errorObject: err, errorStack: extractErrorStackTrace(err) }, additionalFields);
 }
 exports.extractErrorLogData = extractErrorLogData;
+function safeFormatDate(date) {
+    try {
+        const v = new Date(date);
+        return v.toISOString().substring(0, 10);
+    }
+    catch (e) {
+        return date === null || date === void 0 ? void 0 : date.toString();
+    }
+}
+exports.safeFormatDate = safeFormatDate;

package/package.json

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