dbgate-tools 6.1.6 → 6.2.1

package/lib/SqlDumper.d.ts

@@ -12,7 +12,7 @@ export declare class SqlDumper implements AlterProcessor {
     escapeString(value: any): string;
     putStringValue(value: any): void;
     putByteArrayValue(value: any): void;
-    putValue(value: any): void;
+    putValue(value: any, dataType?: any): void;
     putCmd(format: any, ...args: any[]): void;
     putFormattedValue(c: any, value: any): void;
     putFormattedList(c: any, collection: any): void;
@@ -39,6 +39,7 @@ export declare class SqlDumper implements AlterProcessor {
     transform(type: TransformType, dumpExpr: any): void;
     allowIdentityInsert(table: NamedObjectInfo, allow: boolean): void;
     enableConstraints(table: NamedObjectInfo, enabled: boolean): void;
+    enableAllForeignKeys(enabled: boolean): void;
     comment(value: string): void;
     createView(obj: ViewInfo): void;
     dropView(obj: ViewInfo, { testIfExists }: {

package/lib/SqlDumper.js

@@ -50,7 +50,7 @@ class SqlDumper {
     putByteArrayValue(value) {
         this.put('^null');
     }
-    putValue(value) {
+    putValue(value, dataType = null) {
         if (value === null)
             this.put('^null');
         else if (value === true)
@@ -106,6 +106,9 @@ class SqlDumper {
             case 'v':
                 this.putValue(value);
                 break;
+            case 'V':
+                this.putValue(value.value, value.dataType);
+                break;
             case 'c':
                 value(this);
                 break;
@@ -221,7 +224,7 @@ class SqlDumper {
         }
     }
     columnDefinition(column, { includeDefault = true, includeNullable = true, includeCollate = true } = {}) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         if (column.computedExpression) {
             this.put('^as %s', column.computedExpression);
             if (column.isPersisted)
@@ -229,16 +232,26 @@ class SqlDumper {
             return;
         }
         this.columnType(column.dataType);
-        if (column.autoIncrement) {
+        if (column.autoIncrement && !((_a = this.dialect) === null || _a === void 0 ? void 0 : _a.disableAutoIncrement)) {
             this.autoIncrement();
         }
         this.putRaw(' ');
         this.specialColumnOptions(column);
-        if (includeNullable && !((_a = this.dialect) === null || _a === void 0 ? void 0 : _a.specificNullabilityImplementation)) {
-            this.put(column.notNull ? '^not ^null' : '^null');
+        if ((_b = this.dialect) === null || _b === void 0 ? void 0 : _b.defaultValueBeforeNullability) {
+            if (includeDefault && ((_d = (_c = column.defaultValue) === null || _c === void 0 ? void 0 : _c.toString()) === null || _d === void 0 ? void 0 : _d.trim())) {
+                this.columnDefault(column);
+            }
+            if (includeNullable && !((_e = this.dialect) === null || _e === void 0 ? void 0 : _e.specificNullabilityImplementation)) {
+                this.put(column.notNull ? '^not ^null' : '^null');
+            }
         }
-        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);
+        else {
+            if (includeNullable && !((_f = this.dialect) === null || _f === void 0 ? void 0 : _f.specificNullabilityImplementation)) {
+                this.put(column.notNull ? '^not ^null' : '^null');
+            }
+            if (includeDefault && ((_h = (_g = column.defaultValue) === null || _g === void 0 ? void 0 : _g.toString()) === null || _h === void 0 ? void 0 : _h.trim())) {
+                this.columnDefault(column);
+            }
         }
     }
     columnDefault(column) {
@@ -307,8 +320,9 @@ class SqlDumper {
         }
     }
     createForeignKeyFore(fk) {
-        if (fk.constraintName != null)
+        if (fk.constraintName != null && !this.dialect.anonymousForeignKey) {
             this.put('^constraint %i ', fk.constraintName);
+        }
         this.put('^foreign ^key (%,i) ^references %f (%,i)', fk.columns.map(x => x.columnName), { schemaName: fk.refSchemaName, pureName: fk.refTableName }, fk.columns.map(x => x.refColumnName));
         if (fk.deleteAction)
             this.put(' ^on ^delete %k', fk.deleteAction);
@@ -320,6 +334,7 @@ class SqlDumper {
     }
     allowIdentityInsert(table, allow) { }
     enableConstraints(table, enabled) { }
+    enableAllForeignKeys(enabled) { }
     comment(value) {
         if (!value)
             return;

package/lib/createBulkInsertStreamBase.js

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBulkInsertStreamBase = void 0;
 const intersection_1 = __importDefault(require("lodash/intersection"));
+const fromPairs_1 = __importDefault(require("lodash/fromPairs"));
 const getLogger_1 = require("./getLogger");
 const tableTransforms_1 = require("./tableTransforms");
 const logger = (0, getLogger_1.getLogger)('bulkStreamBase');
@@ -24,9 +25,11 @@ function createBulkInsertStreamBase(driver, stream, dbhan, name, options) {
     const writable = new stream.Writable({
         objectMode: true,
     });
+    writable.fullNameQuoted = fullNameQuoted;
     writable.buffer = [];
     writable.structure = null;
     writable.columnNames = null;
+    writable.columnDataTypes = null;
     writable.requireFixedStructure = driver.databaseEngineTypes.includes('sql');
     writable.addRow = (row) => __awaiter(this, void 0, void 0, function* () {
         if (writable.structure) {
@@ -38,8 +41,11 @@ function createBulkInsertStreamBase(driver, stream, dbhan, name, options) {
         }
     });
     writable.checkStructure = () => __awaiter(this, void 0, void 0, function* () {
-        let structure = yield driver.analyseSingleTable(dbhan, name);
-        // console.log('ANALYSING', name, structure);
+        var _a;
+        let structure = (_a = options.targetTableStructure) !== null && _a !== void 0 ? _a : (yield driver.analyseSingleTable(dbhan, name));
+        if (structure) {
+            writable.structure = structure;
+        }
         if (structure && options.dropIfExists) {
             logger.info(`Dropping table ${fullNameQuoted}`);
             yield driver.script(dbhan, `DROP TABLE ${fullNameQuoted}`);
@@ -51,11 +57,22 @@ function createBulkInsertStreamBase(driver, stream, dbhan, name, options) {
             logger.info({ sql: dmp.s }, `Creating table ${fullNameQuoted}`);
             yield driver.script(dbhan, dmp.s);
             structure = yield driver.analyseSingleTable(dbhan, name);
+            writable.structure = structure;
+        }
+        if (!writable.structure) {
+            throw new Error(`Error importing table - ${fullNameQuoted} not found`);
         }
         if (options.truncate) {
             yield driver.script(dbhan, `TRUNCATE TABLE ${fullNameQuoted}`);
         }
         writable.columnNames = (0, intersection_1.default)(structure.columns.map(x => x.columnName), writable.structure.columns.map(x => x.columnName));
+        writable.columnDataTypes = (0, fromPairs_1.default)(writable.columnNames.map(colName => {
+            var _a;
+            return [
+                colName,
+                (_a = writable.structure.columns.find(x => x.columnName == colName)) === null || _a === void 0 ? void 0 : _a.dataType,
+            ];
+        }));
     });
     writable.send = () => __awaiter(this, void 0, void 0, function* () {
         const rows = writable.buffer;
@@ -70,7 +87,7 @@ function createBulkInsertStreamBase(driver, stream, dbhan, name, options) {
                 if (wasRow)
                     dmp.putRaw(',\n');
                 dmp.putRaw('(');
-                dmp.putCollection(',', writable.columnNames, col => dmp.putValue(row[col]));
+                dmp.putCollection(',', writable.columnNames, col => { var _a; return dmp.putValue(row[col], (_a = writable.columnDataTypes) === null || _a === void 0 ? void 0 : _a[col]); });
                 dmp.putRaw(')');
                 wasRow = true;
             }
@@ -86,8 +103,9 @@ function createBulkInsertStreamBase(driver, stream, dbhan, name, options) {
                 dmp.putCollection(',', writable.columnNames, col => dmp.putRaw(driver.dialect.quoteIdentifier(col)));
                 dmp.putRaw(')\n VALUES\n');
                 dmp.putRaw('(');
-                dmp.putCollection(',', writable.columnNames, col => dmp.putValue(row[col]));
+                dmp.putCollection(',', writable.columnNames, col => { var _a; return dmp.putValue(row[col], (_a = writable.columnDataTypes) === null || _a === void 0 ? void 0 : _a[col]); });
                 dmp.putRaw(')');
+                // console.log(dmp.s);
                 yield driver.query(dbhan, dmp.s, { discardResult: true });
             }
         }

package/lib/driverBase.d.ts

@@ -3,6 +3,7 @@ import { EngineDriver, QueryResult, RunScriptOptions } from 'dbgate-types';
 export declare function runCommandOnDriver(pool: any, driver: EngineDriver, cmd: (dmp: SqlDumper) => void | string): Promise<void>;
 export declare function runQueryOnDriver(pool: any, driver: EngineDriver, cmd: (dmp: SqlDumper) => void): Promise<QueryResult>;
 export declare function formatQueryWithoutParams(driver: EngineDriver, sql: string): string;
+export declare function runQueryFmt(driver: any, conn: any, query: any, ...args: any[]): Promise<void>;
 export declare const driverBase: {
     analyserClass: any;
     dumperClass: typeof SqlDumper;
@@ -33,7 +34,7 @@ export declare const driverBase: {
         label: string;
         sql: string;
     }[];
-    loadFieldValues(pool: any, name: any, columnName: any, search: any): Promise<any>;
+    loadFieldValues(pool: any, name: any, columnName: any, search: any, dataType: any): Promise<any>;
     readJsonQuery(pool: any, select: any, structure: any): any;
     showConnectionField: (field: any, values: any) => boolean;
     showConnectionTab: (field: any) => boolean;
@@ -48,6 +49,7 @@ export declare const driverBase: {
         parseHexAsBuffer: boolean;
     };
     createSaveChangeSetScript(changeSet: any, dbinfo: any, defaultCreator: any): any;
+    adaptDataType(dataType: string): string;
     adaptTableInfo(table: any): any;
     listSchemas(pool: any): Promise<any>;
     writeQueryFromStream(dbhan: any, sql: any): Promise<any>;

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 = exports.formatQueryWithoutParams = exports.runQueryOnDriver = exports.runCommandOnDriver = void 0;
+exports.driverBase = exports.runQueryFmt = exports.formatQueryWithoutParams = exports.runQueryOnDriver = exports.runCommandOnDriver = void 0;
 const compact_1 = __importDefault(require("lodash/compact"));
 const isString_1 = __importDefault(require("lodash/isString"));
 const SqlDumper_1 = require("./SqlDumper");
@@ -72,6 +72,14 @@ function formatQueryWithoutParams(driver, sql) {
     return dmp.s;
 }
 exports.formatQueryWithoutParams = formatQueryWithoutParams;
+function runQueryFmt(driver, conn, query, ...args) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const dmp = driver.createDumper();
+        dmp.put(query, ...args);
+        yield driver.query(conn, dmp.s);
+    });
+}
+exports.runQueryFmt = runQueryFmt;
 exports.driverBase = {
     analyserClass: null,
     dumperClass: SqlDumper_1.SqlDumper,
@@ -147,30 +155,41 @@ exports.driverBase = {
         }
         return [];
     },
-    loadFieldValues(pool, name, columnName, search) {
+    loadFieldValues(pool, name, columnName, search, dataType) {
         return __awaiter(this, void 0, void 0, function* () {
             const dmp = this.createDumper();
+            let expr;
+            if (this.dialect.createColumnViewExpression) {
+                expr = this.dialect.createColumnViewExpression(columnName, dataType, { name }, 'value');
+            }
+            if (!expr) {
+                expr = {
+                    exprType: 'column',
+                    columnName,
+                    alias: 'value',
+                };
+            }
             const select = {
                 commandType: 'select',
                 distinct: true,
-                topRecords: 100,
                 from: {
                     name,
                 },
-                columns: [
-                    {
-                        exprType: 'column',
-                        columnName,
-                        alias: 'value',
-                    },
-                ],
+                columns: [expr],
                 orderBy: [
                     {
                         exprType: 'column',
                         columnName,
+                        direction: 'ASC',
                     },
                 ],
             };
+            if (this.dialect.topRecords) {
+                select.topRecords = 100;
+            }
+            else {
+                select.range = { offset: 0, limit: 100 };
+            }
             if (search) {
                 const tokens = (0, compact_1.default)(search.split(' ').map(x => x.trim()));
                 if (tokens.length > 0) {
@@ -227,8 +246,12 @@ exports.driverBase = {
     createSaveChangeSetScript(changeSet, dbinfo, defaultCreator) {
         return defaultCreator(changeSet, dbinfo);
     },
+    adaptDataType(dataType) {
+        return dataType;
+    },
     adaptTableInfo(table) {
-        return table;
+        var _a;
+        return Object.assign(Object.assign({}, table), { columns: (_a = table.columns) === null || _a === void 0 ? void 0 : _a.map(col => (Object.assign(Object.assign({}, col), { dataType: this.adaptDataType(col.dataType) }))) });
     },
     listSchemas(pool) {
         return __awaiter(this, void 0, void 0, function* () {

package/package.json

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