dbgate-tools 4.5.1 → 4.6.3

package/lib/DatabaseAnalyser.d.ts

@@ -21,6 +21,7 @@ export declare class DatabaseAnalyser {
     getDeletedObjectsForField(snapshot: any, objectTypeField: any): any;
     getDeletedObjects(snapshot: any): any[];
     getModifications(): Promise<any[]>;
+    safeQuery(sql: any): Promise<import("dbgate-types").QueryResult>;
     static createEmptyStructure(): DatabaseInfo;
     static byTableFilter(table: any): (x: any) => boolean;
     static extractPrimaryKeys(table: any, pkColumns: any): {

package/lib/DatabaseAnalyser.js

@@ -231,6 +231,19 @@ class DatabaseAnalyser {
             return [...(0, compact_1.default)(res), ...this.getDeletedObjects(snapshot)];
         });
     }
+    safeQuery(sql) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                return yield this.driver.query(this.pool, sql);
+            }
+            catch (err) {
+                console.log('Error running analyser query', err.message);
+                return {
+                    rows: [],
+                };
+            }
+        });
+    }
     static createEmptyStructure() {
         return {
             tables: [],

package/lib/SqlDumper.d.ts

@@ -9,6 +9,7 @@ export declare class SqlDumper implements AlterProcessor {
     putRaw(text: any): void;
     escapeString(value: any): string;
     putStringValue(value: any): void;
+    putByteArrayValue(value: any): void;
     putValue(value: any): void;
     putCmd(format: any, ...args: any[]): void;
     putFormattedValue(c: any, value: any): void;

package/lib/SqlDumper.js

@@ -8,6 +8,8 @@ const lodash_1 = __importDefault(require("lodash"));
 const isString_1 = __importDefault(require("lodash/isString"));
 const isNumber_1 = __importDefault(require("lodash/isNumber"));
 const isDate_1 = __importDefault(require("lodash/isDate"));
+const isArray_1 = __importDefault(require("lodash/isArray"));
+const isPlainObject_1 = __importDefault(require("lodash/isPlainObject"));
 const v1_1 = __importDefault(require("uuid/v1"));
 class SqlDumper {
     constructor(driver) {
@@ -39,6 +41,9 @@ class SqlDumper {
         this.putRaw(this.escapeString(value));
         this.putRaw("'");
     }
+    putByteArrayValue(value) {
+        this.putRaw('NULL');
+    }
     putValue(value) {
         if (value === null)
             this.putRaw('NULL');
@@ -52,6 +57,10 @@ class SqlDumper {
             this.putRaw(value.toString());
         else if ((0, isDate_1.default)(value))
             this.putStringValue(new Date(value).toISOString());
+        else if ((value === null || value === void 0 ? void 0 : value.type) == 'Buffer' && (0, isArray_1.default)(value === null || value === void 0 ? void 0 : value.data))
+            this.putByteArrayValue(value === null || value === void 0 ? void 0 : value.data);
+        else if ((0, isPlainObject_1.default)(value) || (0, isArray_1.default)(value))
+            this.putStringValue(JSON.stringify(value));
         else
             this.putRaw('NULL');
     }

package/lib/createBulkInsertStreamBase.js

@@ -39,18 +39,18 @@ function createBulkInsertStreamBase(driver, stream, pool, name, options) {
         // console.log('ANALYSING', name, structure);
         if (structure && options.dropIfExists) {
             console.log(`Dropping table ${fullNameQuoted}`);
-            yield driver.query(pool, `DROP TABLE ${fullNameQuoted}`);
+            yield driver.script(pool, `DROP TABLE ${fullNameQuoted}`);
         }
         if (options.createIfNotExists && (!structure || options.dropIfExists)) {
             console.log(`Creating table ${fullNameQuoted}`);
             const dmp = driver.createDumper();
             dmp.createTable((0, tableTransforms_1.prepareTableForImport)(Object.assign(Object.assign({}, writable.structure), name)));
             console.log(dmp.s);
-            yield driver.query(pool, dmp.s);
+            yield driver.script(pool, dmp.s);
             structure = yield driver.analyseSingleTable(pool, name);
         }
         if (options.truncate) {
-            yield driver.query(pool, `TRUNCATE TABLE ${fullNameQuoted}`);
+            yield driver.script(pool, `TRUNCATE TABLE ${fullNameQuoted}`);
         }
         writable.columnNames = (0, intersection_1.default)(structure.columns.map(x => x.columnName), writable.structure.columns.map(x => x.columnName));
     });

package/lib/stringTools.d.ts

@@ -1,2 +1,4 @@
 export declare function arrayToHexString(byteArray: any): any;
 export declare function hexStringToArray(inputString: any): any[];
+export declare function parseCellValue(value: any): any;
+export declare function stringifyCellValue(value: any): any;

package/lib/stringTools.js

@@ -1,8 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hexStringToArray = exports.arrayToHexString = void 0;
+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"));
 function arrayToHexString(byteArray) {
-    return byteArray.reduce((output, elem) => output + ('0' + elem.toString(16)).slice(-2), '');
+    return byteArray.reduce((output, elem) => output + ('0' + elem.toString(16)).slice(-2), '').toUpperCase();
 }
 exports.arrayToHexString = arrayToHexString;
 function hexStringToArray(inputString) {
@@ -14,3 +20,36 @@ function hexStringToArray(inputString) {
     return res;
 }
 exports.hexStringToArray = hexStringToArray;
+function parseCellValue(value) {
+    if (!(0, isString_1.default)(value))
+        return value;
+    if (value == '(NULL)')
+        return null;
+    const mHex = value.match(/^0x([0-9a-fA-F][0-9a-fA-F])+$/);
+    if (mHex) {
+        return {
+            type: 'Buffer',
+            data: hexStringToArray(value.substring(2)),
+        };
+    }
+    const mOid = value.match(/^ObjectId\("([0-9a-f]{24})"\)$/);
+    if (mOid) {
+        return { $oid: mOid[1] };
+    }
+    return value;
+}
+exports.parseCellValue = parseCellValue;
+function stringifyCellValue(value) {
+    if (value === null)
+        return '(NULL)';
+    if (value === undefined)
+        return '(NoField)';
+    if ((value === null || value === void 0 ? void 0 : value.type) == 'Buffer' && (0, isArray_1.default)(value.data))
+        return '0x' + arrayToHexString(value.data);
+    if (value === null || value === void 0 ? void 0 : value.$oid)
+        return `ObjectId("${value === null || value === void 0 ? void 0 : value.$oid}")`;
+    if ((0, isPlainObject_1.default)(value) || (0, isArray_1.default)(value))
+        return JSON.stringify(value);
+    return value;
+}
+exports.stringifyCellValue = stringifyCellValue;

package/lib/structureTools.d.ts

@@ -1,4 +1,6 @@
-import { DatabaseInfo, TableInfo } from 'dbgate-types';
+import { DatabaseInfo, TableInfo, ApplicationDefinition } from 'dbgate-types';
 export declare function addTableDependencies(db: DatabaseInfo): DatabaseInfo;
 export declare function extendTableInfo(table: TableInfo): TableInfo;
 export declare function extendDatabaseInfo(db: DatabaseInfo): DatabaseInfo;
+export declare function extendDatabaseInfoFromApps(db: DatabaseInfo, apps: ApplicationDefinition[]): DatabaseInfo;
+export declare function isTableColumnUnique(table: TableInfo, column: string): boolean;

package/lib/structureTools.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.extendDatabaseInfo = exports.extendTableInfo = exports.addTableDependencies = void 0;
+exports.isTableColumnUnique = exports.extendDatabaseInfoFromApps = exports.extendDatabaseInfo = exports.extendTableInfo = exports.addTableDependencies = void 0;
 const flatten_1 = __importDefault(require("lodash/flatten"));
 function addTableDependencies(db) {
     const allForeignKeys = (0, flatten_1.default)(db.tables.map(x => x.foreignKeys || []));
@@ -22,3 +22,26 @@ function extendDatabaseInfo(db) {
     return fillDatabaseExtendedInfo(addTableDependencies(db));
 }
 exports.extendDatabaseInfo = extendDatabaseInfo;
+function extendDatabaseInfoFromApps(db, apps) {
+    if (!db || !apps)
+        return db;
+    const dbExt = Object.assign(Object.assign({}, db), { tables: db.tables.map(table => (Object.assign(Object.assign({}, table), { foreignKeys: [
+                ...(table.foreignKeys || []),
+                ...(0, flatten_1.default)(apps.map(app => app.virtualReferences || []))
+                    .filter(fk => fk.pureName == table.pureName && fk.schemaName == table.schemaName)
+                    .map(fk => (Object.assign(Object.assign({}, fk), { constraintType: 'foreignKey', isVirtual: true }))),
+            ] }))) });
+    return addTableDependencies(dbExt);
+}
+exports.extendDatabaseInfoFromApps = extendDatabaseInfoFromApps;
+function isTableColumnUnique(table, column) {
+    if (table.primaryKey && table.primaryKey.columns.length == 1 && table.primaryKey.columns[0].columnName == column) {
+        return true;
+    }
+    const uqs = [...(table.uniques || []), ...(table.indexes || []).filter(x => x.isUnique)];
+    if (uqs.find(uq => uq.columns.length == 1 && uq.columns[0].columnName == column)) {
+        return true;
+    }
+    return false;
+}
+exports.isTableColumnUnique = isTableColumnUnique;

package/lib/tableTransforms.js

@@ -8,6 +8,9 @@ const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 function prepareTableForImport(table) {
     const res = (0, cloneDeep_1.default)(table);
     res.foreignKeys = [];
+    res.indexes = [];
+    res.uniques = [];
+    res.checks = [];
     if (res.primaryKey)
         res.primaryKey.constraintName = null;
     return res;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.5.1",
+  "version": "4.6.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": "^4.5.1",
+    "dbgate-types": "^4.6.3",
     "jest": "^24.9.0",
     "ts-jest": "^25.2.1",
     "typescript": "^4.4.3"
   },
   "dependencies": {
     "lodash": "^4.17.21",
-    "dbgate-query-splitter": "^4.5.1",
+    "dbgate-query-splitter": "^4.6.3",
     "uuid": "^3.4.0"
   }
 }