dbgate-tools 4.4.5-alpha.1 → 4.6.1

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/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.4.5-alpha.1",
+  "version": "4.6.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": "^4.4.5-alpha.1",
+    "dbgate-types": "^4.6.1",
     "jest": "^24.9.0",
     "ts-jest": "^25.2.1",
     "typescript": "^4.4.3"
   },
   "dependencies": {
     "lodash": "^4.17.21",
-    "dbgate-query-splitter": "^4.4.5-alpha.1",
+    "dbgate-query-splitter": "^4.6.1",
     "uuid": "^3.4.0"
   }
 }