dbgate-tools 4.7.3 → 4.7.4-alpha.3

package/lib/createBulkInsertStreamBase.js

@@ -25,7 +25,7 @@ function createBulkInsertStreamBase(driver, stream, pool, name, options) {
     writable.buffer = [];
     writable.structure = null;
     writable.columnNames = null;
-    writable.requireFixedStructure = !driver.dialect.nosql;
+    writable.requireFixedStructure = driver.databaseEngineTypes.includes('sql');
     writable.addRow = (row) => __awaiter(this, void 0, void 0, function* () {
         if (writable.structure) {
             writable.buffer.push(row);

package/lib/driverBase.d.ts

@@ -14,6 +14,7 @@ export declare const driverBase: {
             isPersisted: boolean;
         };
     };
+    databaseEngineTypes: string[];
     analyseFull(pool: any, version: any): Promise<any>;
     analyseSingleObject(pool: any, name: any, typeField?: string): Promise<any>;
     analyseSingleTable(pool: any, name: any): any;
@@ -24,4 +25,5 @@ export declare const driverBase: {
         label: string;
         sql: string;
     }[];
+    loadFieldValues(pool: any, name: any, columnName: any, search: any): Promise<any>;
 };

package/lib/driverBase.js

@@ -8,10 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.driverBase = void 0;
+const compact_1 = __importDefault(require("lodash/compact"));
 const SqlDumper_1 = require("./SqlDumper");
 const dbgate_query_splitter_1 = require("dbgate-query-splitter");
+const dbgate_sqltree_1 = require("dbgate-sqltree");
 const dialect = {
     limitSelect: true,
     rangeSelect: true,
@@ -30,6 +35,7 @@ exports.driverBase = {
     analyserClass: null,
     dumperClass: SqlDumper_1.SqlDumper,
     dialect,
+    databaseEngineTypes: ['sql'],
     analyseFull(pool, version) {
         return __awaiter(this, void 0, void 0, function* () {
             const analyser = new this.analyserClass(pool, this, version);
@@ -62,10 +68,59 @@ exports.driverBase = {
         });
     },
     getNewObjectTemplates() {
-        var _a;
-        if (!((_a = this.dialect) === null || _a === void 0 ? void 0 : _a.nosql)) {
+        if (this.databaseEngineTypes.includes('sql')) {
             return [{ label: 'New view', sql: 'CREATE VIEW myview\nAS\nSELECT * FROM table1' }];
         }
         return [];
     },
+    loadFieldValues(pool, name, columnName, search) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const dmp = this.createDumper();
+            const select = {
+                commandType: 'select',
+                distinct: true,
+                topRecords: 100,
+                from: {
+                    name,
+                },
+                columns: [
+                    {
+                        exprType: 'column',
+                        columnName,
+                        alias: 'value',
+                    },
+                ],
+                orderBy: [
+                    {
+                        exprType: 'column',
+                        columnName,
+                    },
+                ],
+            };
+            if (search) {
+                const tokens = (0, compact_1.default)(search.split(' ').map(x => x.trim()));
+                if (tokens.length > 0) {
+                    // @ts-ignore
+                    select.where = {
+                        conditionType: 'and',
+                        conditions: tokens.map(token => ({
+                            conditionType: 'like',
+                            left: {
+                                exprType: 'column',
+                                columnName,
+                            },
+                            right: {
+                                exprType: 'value',
+                                value: `%${token}%`,
+                            },
+                        })),
+                    };
+                }
+            }
+            // @ts-ignore
+            (0, dbgate_sqltree_1.dumpSqlSelect)(dmp, select);
+            const resp = yield this.query(pool, dmp.s);
+            return resp.rows;
+        });
+    },
 };

package/lib/stringTools.d.ts

@@ -4,3 +4,4 @@ export declare function parseCellValue(value: any): any;
 export declare function stringifyCellValue(value: any): any;
 export declare function safeJsonParse(json: any, defaultValue?: any, logError?: boolean): any;
 export declare function isJsonLikeLongString(value: any): RegExpMatchArray;
+export declare function getIconForRedisType(type: any): "img folder" | "img type-string" | "img type-hash" | "img type-set" | "img type-list" | "img type-zset" | "img type-stream" | "img type-binary" | "img type-rejson";

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.isJsonLikeLongString = exports.safeJsonParse = exports.stringifyCellValue = exports.parseCellValue = exports.hexStringToArray = exports.arrayToHexString = void 0;
+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"));
@@ -69,3 +69,28 @@ function isJsonLikeLongString(value) {
     return (0, isString_1.default)(value) && value.length > 100 && value.match(/^\s*\{.*\}\s*$|^\s*\[.*\]\s*$/);
 }
 exports.isJsonLikeLongString = isJsonLikeLongString;
+function getIconForRedisType(type) {
+    switch (type) {
+        case 'dir':
+            return 'img folder';
+        case 'string':
+            return 'img type-string';
+        case 'hash':
+            return 'img type-hash';
+        case 'set':
+            return 'img type-set';
+        case 'list':
+            return 'img type-list';
+        case 'zset':
+            return 'img type-zset';
+        case 'stream':
+            return 'img type-stream';
+        case 'binary':
+            return 'img type-binary';
+        case 'ReJSON-RL':
+            return 'img type-rejson';
+        default:
+            return null;
+    }
+}
+exports.getIconForRedisType = getIconForRedisType;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.7.3",
+  "version": "4.7.4-alpha.3",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -25,14 +25,15 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^4.7.3",
+    "dbgate-types": "^4.7.4-alpha.3",
     "jest": "^24.9.0",
     "ts-jest": "^25.2.1",
     "typescript": "^4.4.3"
   },
   "dependencies": {
     "lodash": "^4.17.21",
-    "dbgate-query-splitter": "^4.7.3",
+    "dbgate-query-splitter": "^4.7.4-alpha.3",
+    "dbgate-sqltree": "^4.7.4-alpha.3",
     "uuid": "^3.4.0"
   }
 }