dbgate-tools 6.1.6 → 6.2.0

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;

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;
         if (column.computedExpression) {
             this.put('^as %s', column.computedExpression);
             if (column.isPersisted)
@@ -229,15 +232,15 @@ 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)) {
+        if (includeNullable && !((_b = this.dialect) === null || _b === void 0 ? void 0 : _b.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())) {
+        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);
         }
     }

package/lib/createBulkInsertStreamBase.js

@@ -24,6 +24,7 @@ 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;
@@ -39,7 +40,9 @@ 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);
+        if (structure) {
+            writable.structure = structure;
+        }
         if (structure && options.dropIfExists) {
             logger.info(`Dropping table ${fullNameQuoted}`);
             yield driver.script(dbhan, `DROP TABLE ${fullNameQuoted}`);

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;

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) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.1.6",
+  "version": "6.2.0",
   "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.0",
     "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.0",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",