dbgate-tools 5.2.2 → 5.2.3

package/lib/DatabaseAnalyser.js

@@ -228,6 +228,9 @@ class DatabaseAnalyser {
         if (this.pool.feedback) {
             this.pool.feedback(obj);
         }
+        if (obj && obj.analysingMessage) {
+            logger.debug(obj.analysingMessage);
+        }
     }
     getModifications() {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/ScriptWriter.d.ts

@@ -13,6 +13,7 @@ export declare class ScriptWriter {
     copyStream(sourceVar: any, targetVar: any, colmapVar?: any): void;
     dumpDatabase(options: any): void;
     importDatabase(options: any): void;
+    dataDuplicator(options: any): void;
     comment(s: any): void;
     getScript(schedule?: any): string;
 }
@@ -30,6 +31,7 @@ export declare class ScriptWriterJson {
     comment(text: any): void;
     dumpDatabase(options: any): void;
     importDatabase(options: any): void;
+    dataDuplicator(options: any): void;
     getScript(schedule?: any): {
         type: string;
         schedule: any;

package/lib/ScriptWriter.js

@@ -51,6 +51,9 @@ class ScriptWriter {
     importDatabase(options) {
         this._put(`await dbgateApi.importDatabase(${JSON.stringify(options)});`);
     }
+    dataDuplicator(options) {
+        this._put(`await dbgateApi.dataDuplicator(${JSON.stringify(options)});`);
+    }
     comment(s) {
         this._put(`// ${s}`);
     }
@@ -126,6 +129,12 @@ class ScriptWriterJson {
             options,
         });
     }
+    dataDuplicator(options) {
+        this.commands.push({
+            type: 'dataDuplicator',
+            options,
+        });
+    }
     getScript(schedule = null) {
         return {
             type: 'json',
@@ -168,6 +177,9 @@ function jsonScriptToJavascript(json) {
             case 'importDatabase':
                 script.importDatabase(cmd.options);
                 break;
+            case 'dataDuplicator':
+                script.dataDuplicator(cmd.options);
+                break;
         }
     }
     return script.getScript(schedule);

package/lib/SqlDumper.d.ts

@@ -21,6 +21,7 @@ export declare class SqlDumper implements AlterProcessor {
     createDatabase(name: string): void;
     dropDatabase(name: string): void;
     specialColumnOptions(column: any): void;
+    selectScopeIdentity(table: TableInfo): void;
     columnDefinition(column: ColumnInfo, { includeDefault, includeNullable, includeCollate }?: {
         includeDefault?: boolean;
         includeNullable?: boolean;
@@ -29,6 +30,7 @@ export declare class SqlDumper implements AlterProcessor {
     columnDefault(column: ColumnInfo): void;
     putCollection<T>(delimiter: string, collection: T[], lambda: (col: T) => void): void;
     createTable(table: TableInfo): void;
+    createTablePrimaryKeyCore(table: TableInfo): void;
     createForeignKeyFore(fk: ForeignKeyInfo): void;
     transform(type: TransformType, dumpExpr: any): void;
     allowIdentityInsert(table: NamedObjectInfo, allow: boolean): void;
@@ -98,6 +100,7 @@ export declare class SqlDumper implements AlterProcessor {
     renameTable(obj: TableInfo, newname: string): void;
     beginTransaction(): void;
     commitTransaction(): void;
+    rollbackTransaction(): void;
     alterProlog(): void;
     alterEpilog(): void;
     selectTableIntoNewTable(sourceName: NamedObjectInfo, targetName: NamedObjectInfo): void;

package/lib/SqlDumper.js

@@ -183,6 +183,7 @@ class SqlDumper {
         this.putCmd('^drop ^database %i', name);
     }
     specialColumnOptions(column) { }
+    selectScopeIdentity(table) { }
     columnDefinition(column, { includeDefault = true, includeNullable = true, includeCollate = true } = {}) {
         var _a;
         if (column.computedExpression) {
@@ -229,13 +230,7 @@ class SqlDumper {
             this.put('%i ', col.columnName);
             this.columnDefinition(col);
         });
-        if (table.primaryKey) {
-            this.put(',&n');
-            if (table.primaryKey.constraintName) {
-                this.put('^constraint %i', table.primaryKey.constraintName);
-            }
-            this.put(' ^primary ^key (%,i)', table.primaryKey.columns.map(x => x.columnName));
-        }
+        this.createTablePrimaryKeyCore(table);
         (table.foreignKeys || []).forEach(fk => {
             this.put(',&n');
             this.createForeignKeyFore(fk);
@@ -254,6 +249,15 @@ class SqlDumper {
             this.createIndex(ix);
         });
     }
+    createTablePrimaryKeyCore(table) {
+        if (table.primaryKey) {
+            this.put(',&n');
+            if (table.primaryKey.constraintName) {
+                this.put('^constraint %i', table.primaryKey.constraintName);
+            }
+            this.put(' ^primary ^key (%,i)', table.primaryKey.columns.map(x => x.columnName));
+        }
+    }
     createForeignKeyFore(fk) {
         if (fk.constraintName != null)
             this.put('^constraint %i ', fk.constraintName);
@@ -481,6 +485,9 @@ class SqlDumper {
     commitTransaction() {
         this.putCmd('^commit');
     }
+    rollbackTransaction() {
+        this.putCmd('^rollback');
+    }
     alterProlog() { }
     alterEpilog() { }
     selectTableIntoNewTable(sourceName, targetName) {

package/lib/createAsyncWriteStream.d.ts

@@ -0,0 +1,4 @@
+export interface AsyncWriteStreamOptions {
+    processItem: (chunk: any) => Promise<void>;
+}
+export declare function createAsyncWriteStream(stream: any, options: AsyncWriteStreamOptions): any;

package/lib/createAsyncWriteStream.js

@@ -0,0 +1,33 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAsyncWriteStream = void 0;
+const getLogger_1 = require("./getLogger");
+const logger = (0, getLogger_1.getLogger)('asyncWriteStream');
+function createAsyncWriteStream(stream, options) {
+    const writable = new stream.Writable({
+        objectMode: true,
+    });
+    writable._write = (chunk, encoding, callback) => __awaiter(this, void 0, void 0, function* () {
+        try {
+            yield options.processItem(chunk);
+            callback(null);
+        }
+        catch (err) {
+            callback(err);
+        }
+    });
+    // writable._final = async callback => {
+    //   callback();
+    // };
+    return writable;
+}
+exports.createAsyncWriteStream = createAsyncWriteStream;

package/lib/createBulkInsertStreamBase.d.ts

@@ -1 +1,2 @@
-export declare function createBulkInsertStreamBase(driver: any, stream: any, pool: any, name: any, options: any): any;
+import { EngineDriver, WriteTableOptions } from 'dbgate-types';
+export declare function createBulkInsertStreamBase(driver: EngineDriver, stream: any, pool: any, name: any, options: WriteTableOptions): any;

package/lib/createBulkInsertStreamBase.js

@@ -75,7 +75,7 @@ function createBulkInsertStreamBase(driver, stream, pool, name, options) {
         dmp.putRaw(';');
         // require('fs').writeFileSync('/home/jena/test.sql', dmp.s);
         // console.log(dmp.s);
-        yield driver.query(pool, dmp.s);
+        yield driver.query(pool, dmp.s, { discardResult: true });
     });
     writable.sendIfFull = () => __awaiter(this, void 0, void 0, function* () {
         if (writable.buffer.length > 100) {

package/lib/diffTools.d.ts

@@ -17,6 +17,7 @@ export interface DbDiffOptions {
     ignoreDataTypes?: boolean;
 }
 export declare function generateTablePairingId(table: TableInfo): TableInfo;
+export declare function removeTablePairingId(table: TableInfo): TableInfo;
 export declare function generateDbPairingId(db: DatabaseInfo): DatabaseInfo;
 export declare function testEqualColumns(a: ColumnInfo, b: ColumnInfo, checkName: boolean, checkDefault: boolean, opts?: DbDiffOptions): boolean;
 export declare function testEqualTypes(a: ColumnInfo, b: ColumnInfo, opts?: DbDiffOptions): boolean;

package/lib/diffTools.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.modelCompareDbDiffOptions = exports.matchPairedObjects = exports.getAlterDatabaseScript = exports.getAlterTableScript = exports.createAlterDatabasePlan = exports.createAlterTablePlan = exports.testEqualSqlObjects = exports.testEqualTables = exports.testEqualTypes = exports.testEqualColumns = exports.generateDbPairingId = exports.generateTablePairingId = void 0;
+exports.modelCompareDbDiffOptions = exports.matchPairedObjects = exports.getAlterDatabaseScript = exports.getAlterTableScript = exports.createAlterDatabasePlan = exports.createAlterTablePlan = exports.testEqualSqlObjects = exports.testEqualTables = exports.testEqualTypes = exports.testEqualColumns = exports.generateDbPairingId = exports.removeTablePairingId = exports.generateTablePairingId = void 0;
 const v1_1 = __importDefault(require("uuid/v1"));
 const alterPlan_1 = require("./alterPlan");
 const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
@@ -21,6 +21,13 @@ function generateTablePairingId(table) {
     return table;
 }
 exports.generateTablePairingId = generateTablePairingId;
+function removeTablePairingId(table) {
+    var _a, _b, _c, _d, _e;
+    if (!table)
+        return table;
+    return Object.assign(Object.assign({}, table), { columns: (_a = table.columns) === null || _a === void 0 ? void 0 : _a.map(col => (Object.assign(Object.assign({}, col), { pairingId: undefined }))), foreignKeys: (_b = table.foreignKeys) === null || _b === void 0 ? void 0 : _b.map(cnt => (Object.assign(Object.assign({}, cnt), { pairingId: undefined }))), checks: (_c = table.checks) === null || _c === void 0 ? void 0 : _c.map(cnt => (Object.assign(Object.assign({}, cnt), { pairingId: undefined }))), indexes: (_d = table.indexes) === null || _d === void 0 ? void 0 : _d.map(cnt => (Object.assign(Object.assign({}, cnt), { pairingId: undefined }))), uniques: (_e = table.uniques) === null || _e === void 0 ? void 0 : _e.map(cnt => (Object.assign(Object.assign({}, cnt), { pairingId: undefined }))), pairingId: undefined });
+}
+exports.removeTablePairingId = removeTablePairingId;
 function generateObjectPairingId(obj) {
     if (obj.objectTypeField)
         return Object.assign(Object.assign({}, obj), { pairingId: obj.pairingId || (0, v1_1.default)() });
@@ -375,11 +382,7 @@ function getAlterTableScript(oldTable, newTable, opts, wholeOldDb, wholeNewDb, d
     }
     const plan = createAlterTablePlan(oldTable, newTable, opts, wholeOldDb, wholeNewDb, driver);
     const dmp = driver.createDumper({ useHardSeparator: true });
-    if (!driver.dialect.disableExplicitTransaction)
-        dmp.beginTransaction();
     plan.run(dmp);
-    if (!driver.dialect.disableExplicitTransaction)
-        dmp.commitTransaction();
     return {
         sql: dmp.s,
         recreates: plan.recreates,
@@ -389,11 +392,7 @@ exports.getAlterTableScript = getAlterTableScript;
 function getAlterDatabaseScript(oldDb, newDb, opts, wholeOldDb, wholeNewDb, driver) {
     const plan = createAlterDatabasePlan(oldDb, newDb, opts, wholeOldDb, wholeNewDb, driver);
     const dmp = driver.createDumper({ useHardSeparator: true });
-    if (!driver.dialect.disableExplicitTransaction)
-        dmp.beginTransaction();
     plan.run(dmp);
-    if (!driver.dialect.disableExplicitTransaction)
-        dmp.commitTransaction();
     return {
         sql: dmp.s,
         recreates: plan.recreates,

package/lib/driverBase.d.ts

@@ -1,4 +1,7 @@
 import { SqlDumper } from './SqlDumper';
+import { EngineDriver, QueryResult, RunScriptOptions } from 'dbgate-types';
+export declare function runCommandOnDriver(pool: any, driver: EngineDriver, cmd: (dmp: SqlDumper) => void): Promise<void>;
+export declare function runQueryOnDriver(pool: any, driver: EngineDriver, cmd: (dmp: SqlDumper) => void): Promise<QueryResult>;
 export declare const driverBase: {
     analyserClass: any;
     dumperClass: typeof SqlDumper;
@@ -21,8 +24,8 @@ export declare const driverBase: {
     analyseSingleObject(pool: any, name: any, typeField?: string): Promise<any>;
     analyseSingleTable(pool: any, name: any): any;
     analyseIncremental(pool: any, structure: any, version: any): Promise<any>;
-    createDumper(options?: any): any;
-    script(pool: any, sql: any): Promise<void>;
+    createDumper(options?: any): SqlDumper;
+    script(pool: any, sql: any, options: RunScriptOptions): Promise<void>;
     getNewObjectTemplates(): {
         label: string;
         sql: string;

package/lib/driverBase.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.driverBase = void 0;
+exports.driverBase = exports.runQueryOnDriver = exports.runCommandOnDriver = void 0;
 const compact_1 = __importDefault(require("lodash/compact"));
 const SqlDumper_1 = require("./SqlDumper");
 const dbgate_query_splitter_1 = require("dbgate-query-splitter");
@@ -32,6 +32,24 @@ const dialect = {
     },
     defaultSchemaName: null,
 };
+function runCommandOnDriver(pool, driver, cmd) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const dmp = driver.createDumper();
+        cmd(dmp);
+        // console.log('CMD:', dmp.s);
+        yield driver.query(pool, dmp.s, { discardResult: true });
+    });
+}
+exports.runCommandOnDriver = runCommandOnDriver;
+function runQueryOnDriver(pool, driver, cmd) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const dmp = driver.createDumper();
+        cmd(dmp);
+        // console.log('QUERY:', dmp.s);
+        return yield driver.query(pool, dmp.s);
+    });
+}
+exports.runQueryOnDriver = runQueryOnDriver;
 exports.driverBase = {
     analyserClass: null,
     dumperClass: SqlDumper_1.SqlDumper,
@@ -62,10 +80,24 @@ exports.driverBase = {
     createDumper(options = null) {
         return new this.dumperClass(this, options);
     },
-    script(pool, sql) {
+    script(pool, sql, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (options === null || options === void 0 ? void 0 : options.useTransaction) {
+                runCommandOnDriver(pool, this, dmp => dmp.beginTransaction());
+            }
             for (const sqlItem of (0, dbgate_query_splitter_1.splitQuery)(sql, this.getQuerySplitterOptions('script'))) {
-                yield this.query(pool, sqlItem, { discardResult: true });
+                try {
+                    yield this.query(pool, sqlItem, { discardResult: true });
+                }
+                catch (err) {
+                    if (options === null || options === void 0 ? void 0 : options.useTransaction) {
+                        runCommandOnDriver(pool, this, dmp => dmp.rollbackTransaction());
+                    }
+                    throw err;
+                }
+            }
+            if (options === null || options === void 0 ? void 0 : options.useTransaction) {
+                runCommandOnDriver(pool, this, dmp => dmp.commitTransaction());
             }
         });
     },
@@ -131,5 +163,5 @@ exports.driverBase = {
         return this.readQuery(pool, dmp.s, structure);
     },
     showConnectionField: (field, values) => false,
-    showConnectionTab: (field) => true,
+    showConnectionTab: field => true,
 };

package/lib/index.d.ts

@@ -3,6 +3,7 @@ export * from './nameTools';
 export * from './tableTransforms';
 export * from './packageTools';
 export * from './createBulkInsertStreamBase';
+export * from './createAsyncWriteStream';
 export * from './DatabaseAnalyser';
 export * from './driverBase';
 export * from './SqlDumper';

package/lib/index.js

@@ -19,6 +19,7 @@ __exportStar(require("./nameTools"), exports);
 __exportStar(require("./tableTransforms"), exports);
 __exportStar(require("./packageTools"), exports);
 __exportStar(require("./createBulkInsertStreamBase"), exports);
+__exportStar(require("./createAsyncWriteStream"), exports);
 __exportStar(require("./DatabaseAnalyser"), exports);
 __exportStar(require("./driverBase"), exports);
 __exportStar(require("./SqlDumper"), exports);

package/lib/schemaEditorTools.d.ts

@@ -1,11 +1,18 @@
 import type { ColumnInfo, ConstraintInfo, TableInfo } from 'dbgate-types';
+export interface JsonDataObjectUpdateCommand {
+    type: 'renameField' | 'deleteField' | 'setField' | 'setFieldIfNull';
+    oldField?: string;
+    newField?: string;
+    value?: any;
+}
 export interface EditorColumnInfo extends ColumnInfo {
     isPrimaryKey?: boolean;
 }
 export declare function fillEditorColumnInfo(column: ColumnInfo, table: TableInfo): EditorColumnInfo;
-export declare function editorAddColumn(table: TableInfo, column: EditorColumnInfo): TableInfo;
-export declare function editorModifyColumn(table: TableInfo, column: EditorColumnInfo): TableInfo;
-export declare function editorDeleteColumn(table: TableInfo, column: EditorColumnInfo): TableInfo;
+export declare function processJsonDataUpdateCommands(obj: any, commands?: JsonDataObjectUpdateCommand[]): any;
+export declare function editorAddColumn(table: TableInfo, column: EditorColumnInfo, addDataCommand?: boolean): TableInfo;
+export declare function editorModifyColumn(table: TableInfo, column: EditorColumnInfo, addDataCommand?: boolean): TableInfo;
+export declare function editorDeleteColumn(table: TableInfo, column: EditorColumnInfo, addDataCommand?: boolean): TableInfo;
 export declare function editorAddConstraint(table: TableInfo, constraint: ConstraintInfo): TableInfo;
 export declare function editorModifyConstraint(table: TableInfo, constraint: ConstraintInfo): TableInfo;
 export declare function editorDeleteConstraint(table: TableInfo, constraint: ConstraintInfo): TableInfo;

package/lib/schemaEditorTools.js

@@ -3,15 +3,43 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.editorDeleteConstraint = exports.editorModifyConstraint = exports.editorAddConstraint = exports.editorDeleteColumn = exports.editorModifyColumn = exports.editorAddColumn = exports.fillEditorColumnInfo = void 0;
+exports.editorDeleteConstraint = exports.editorModifyConstraint = exports.editorAddConstraint = exports.editorDeleteColumn = exports.editorModifyColumn = exports.editorAddColumn = exports.processJsonDataUpdateCommands = exports.fillEditorColumnInfo = void 0;
 const v1_1 = __importDefault(require("uuid/v1"));
 const omit_1 = __importDefault(require("lodash/omit"));
 const lodash_1 = __importDefault(require("lodash"));
+const stringTools_1 = require("./stringTools");
 function fillEditorColumnInfo(column, table) {
     var _a, _b;
     return Object.assign({ isPrimaryKey: !!((_b = (_a = table === null || table === void 0 ? void 0 : table.primaryKey) === null || _a === void 0 ? void 0 : _a.columns) === null || _b === void 0 ? void 0 : _b.find(x => x.columnName == column.columnName)), dataType: lodash_1.default.isEmpty(column) ? 'int' : undefined }, column);
 }
 exports.fillEditorColumnInfo = fillEditorColumnInfo;
+function processJsonDataUpdateCommands(obj, commands = []) {
+    for (const cmd of commands) {
+        switch (cmd.type) {
+            case 'deleteField':
+                obj = Object.assign({}, obj);
+                delete obj[cmd.oldField];
+                break;
+            case 'renameField':
+                obj = Object.assign({}, obj);
+                obj[cmd.newField] = obj[cmd.oldField];
+                delete obj[cmd.oldField];
+                break;
+            case 'setField':
+                obj = Object.assign({}, obj);
+                obj[cmd.newField] = cmd.value;
+                break;
+            case 'setFieldIfNull':
+                obj = Object.assign({}, obj);
+                if (obj[cmd.newField] == null) {
+                    obj[cmd.newField] = cmd.value;
+                }
+                break;
+        }
+    }
+    return obj;
+}
+exports.processJsonDataUpdateCommands = processJsonDataUpdateCommands;
 function processPrimaryKey(table, oldColumn, newColumn) {
     if (!(oldColumn === null || oldColumn === void 0 ? void 0 : oldColumn.isPrimaryKey) && (newColumn === null || newColumn === void 0 ? void 0 : newColumn.isPrimaryKey)) {
         let primaryKey = table === null || table === void 0 ? void 0 : table.primaryKey;
@@ -42,23 +70,53 @@ function processPrimaryKey(table, oldColumn, newColumn) {
     }
     return table;
 }
-function editorAddColumn(table, column) {
+function defineDataCommand(table, cmd) {
+    table['__addDataCommands'] = [...(table['__addDataCommands'] || []), cmd()];
+}
+function editorAddColumn(table, column, addDataCommand) {
     let res = Object.assign(Object.assign({}, table), { columns: [...((table === null || table === void 0 ? void 0 : table.columns) || []), Object.assign(Object.assign({}, column), { pairingId: (0, v1_1.default)() })] });
     res = processPrimaryKey(res, null, column);
+    if (addDataCommand && column.defaultValue) {
+        defineDataCommand(res, () => ({
+            type: 'setField',
+            newField: column.columnName,
+            value: (0, stringTools_1.parseSqlDefaultValue)(column.defaultValue),
+        }));
+    }
     return res;
 }
 exports.editorAddColumn = editorAddColumn;
-function editorModifyColumn(table, column) {
+function editorModifyColumn(table, column, addDataCommand) {
     var _a;
     const oldColumn = (_a = table === null || table === void 0 ? void 0 : table.columns) === null || _a === void 0 ? void 0 : _a.find(x => x.pairingId == column.pairingId);
     let res = Object.assign(Object.assign({}, table), { columns: table.columns.map(col => (col.pairingId == column.pairingId ? (0, omit_1.default)(column, ['isPrimaryKey']) : col)) });
     res = processPrimaryKey(res, fillEditorColumnInfo(oldColumn, table), column);
+    if (addDataCommand && oldColumn.columnName != column.columnName) {
+        defineDataCommand(res, () => ({
+            type: 'renameField',
+            oldField: oldColumn.columnName,
+            newField: column.columnName,
+        }));
+    }
+    if (addDataCommand && !oldColumn.defaultValue && column.defaultValue) {
+        defineDataCommand(res, () => ({
+            type: 'setFieldIfNull',
+            newField: column.columnName,
+            value: (0, stringTools_1.parseSqlDefaultValue)(column.defaultValue),
+        }));
+    }
     return res;
 }
 exports.editorModifyColumn = editorModifyColumn;
-function editorDeleteColumn(table, column) {
+function editorDeleteColumn(table, column, addDataCommand) {
     let res = Object.assign(Object.assign({}, table), { columns: table.columns.filter(col => col.pairingId != column.pairingId) });
     res = processPrimaryKey(res, column, null);
+    if (addDataCommand) {
+        defineDataCommand(res, () => ({
+            type: 'deleteField',
+            oldField: column.columnName,
+        }));
+    }
     return res;
 }
 exports.editorDeleteColumn = editorDeleteColumn;

package/lib/stringTools.d.ts

@@ -8,3 +8,4 @@ export declare function getIconForRedisType(type: any): "img folder" | "img type
 export declare function isWktGeometry(s: any): boolean;
 export declare function arrayBufferToBase64(buffer: any): string;
 export declare function getAsImageSrc(obj: any): string;
+export declare function parseSqlDefaultValue(value: string): string | number;

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.getAsImageSrc = exports.arrayBufferToBase64 = exports.isWktGeometry = exports.getIconForRedisType = exports.isJsonLikeLongString = exports.safeJsonParse = exports.stringifyCellValue = exports.parseCellValue = exports.hexStringToArray = exports.arrayToHexString = void 0;
+exports.parseSqlDefaultValue = exports.getAsImageSrc = exports.arrayBufferToBase64 = exports.isWktGeometry = exports.getIconForRedisType = exports.isJsonLikeLongString = 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 isPlainObject_1 = __importDefault(require("lodash/isPlainObject"));
@@ -121,3 +121,17 @@ function getAsImageSrc(obj) {
     return null;
 }
 exports.getAsImageSrc = getAsImageSrc;
+function parseSqlDefaultValue(value) {
+    if (!value)
+        return undefined;
+    if (!(0, isString_1.default)(value))
+        return undefined;
+    if (value.startsWith("'") && value.endsWith("'")) {
+        return value.slice(1, -1);
+    }
+    if (!isNaN(value) && !isNaN(parseFloat(value))) {
+        return parseFloat(value);
+    }
+    return undefined;
+}
+exports.parseSqlDefaultValue = parseSqlDefaultValue;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.2.2",
+  "version": "5.2.3",
   "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.2.2",
+    "dbgate-types": "^5.2.3",
     "jest": "^24.9.0",
     "ts-jest": "^25.2.1",
     "typescript": "^4.4.3"
   },
   "dependencies": {
     "dbgate-query-splitter": "^4.9.3",
-    "dbgate-sqltree": "^5.2.2",
+    "dbgate-sqltree": "^5.2.3",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",