dbgate-tools 5.0.1 → 5.0.4-alpha.2

package/lib/DatabaseAnalyser.d.ts

@@ -17,9 +17,12 @@ export declare class DatabaseAnalyser {
     incrementalAnalysis(structure: any): Promise<DatabaseInfo>;
     mergeAnalyseResult(newlyAnalysed: any): any;
     getRequestedObjectPureNames(objectTypeField: any, allPureNames: any): any;
+    containsObjectIdCondition(typeFields: any): boolean;
     createQuery(template: any, typeFields: any): any;
+    createQueryCore(template: any, typeFields: any): any;
     getDeletedObjectsForField(snapshot: any, objectTypeField: any): any;
     getDeletedObjects(snapshot: any): any[];
+    feedback(obj: any): void;
     getModifications(): Promise<any[]>;
     safeQuery(sql: any): Promise<import("dbgate-types").QueryResult>;
     static createEmptyStructure(): DatabaseInfo;

package/lib/DatabaseAnalyser.js

@@ -165,7 +165,13 @@ class DatabaseAnalyser {
     // findObjectById(id) {
     //   return this.structure.tables.find((x) => x.objectId == id);
     // }
+    containsObjectIdCondition(typeFields) {
+        return this.createQueryCore('=OBJECT_ID_CONDITION', typeFields) != ' is not null';
+    }
     createQuery(template, typeFields) {
+        return this.createQueryCore(template, typeFields);
+    }
+    createQueryCore(template, typeFields) {
         // let res = template;
         if (this.singleObjectFilter) {
             const { typeField } = this.singleObjectFilter;
@@ -216,6 +222,11 @@ class DatabaseAnalyser {
             ...this.getDeletedObjectsForField(snapshot, 'triggers'),
         ];
     }
+    feedback(obj) {
+        if (this.pool.feedback) {
+            this.pool.feedback(obj);
+        }
+    }
     getModifications() {
         return __awaiter(this, void 0, void 0, function* () {
             const snapshot = yield this._getFastSnapshot();

package/lib/stringTools.d.ts

@@ -5,3 +5,4 @@ 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";
+export declare function isWktGeometry(s: any): boolean;

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.getIconForRedisType = exports.isJsonLikeLongString = exports.safeJsonParse = exports.stringifyCellValue = exports.parseCellValue = exports.hexStringToArray = exports.arrayToHexString = void 0;
+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"));
@@ -94,3 +94,10 @@ function getIconForRedisType(type) {
     }
 }
 exports.getIconForRedisType = getIconForRedisType;
+function isWktGeometry(s) {
+    if (!(0, isString_1.default)(s))
+        return false;
+    // return !!s.match(/^POINT\s*\(|/)
+    return !!s.match(/^POINT\s*\(|^LINESTRING\s*\(|^POLYGON\s*\(|^MULTIPOINT\s*\(|^MULTILINESTRING\s*\(|^MULTIPOLYGON\s*\(|^GEOMCOLLECTION\s*\(|^GEOMETRYCOLLECTION\s*\(/);
+}
+exports.isWktGeometry = isWktGeometry;

package/lib/yamlModelConv.d.ts

@@ -7,6 +7,7 @@ export interface ColumnInfoYaml {
     autoIncrement?: boolean;
     references?: string;
     primaryKey?: boolean;
+    default?: string;
 }
 export interface DatabaseModelFile {
     name: string;

package/lib/yamlModelConv.js

@@ -12,6 +12,7 @@ function columnInfoToYaml(column, table) {
     const res = {
         name: column.columnName,
         type: column.dataType,
+        default: column.defaultValue,
     };
     if (column.autoIncrement)
         res.autoIncrement = true;
@@ -39,6 +40,7 @@ function columnInfoFromYaml(column, table) {
         dataType: column.length ? `${column.type}(${column.length})` : column.type,
         autoIncrement: column.autoIncrement,
         notNull: column.notNull || (table.primaryKey && table.primaryKey.includes(column.name)),
+        defaultValue: column.default,
     };
     return res;
 }

package/package.json

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