dbgate-tools 5.4.5-alpha.5 → 5.5.1

package/lib/DatabaseAnalyser.d.ts

@@ -1,7 +1,7 @@
-import { DatabaseInfo, DatabaseModification, EngineDriver, SqlDialect } from 'dbgate-types';
+import { DatabaseHandle, DatabaseInfo, DatabaseModification, EngineDriver, SqlDialect } from 'dbgate-types';
 import { type Logger } from 'pinomin';
 export declare class DatabaseAnalyser {
-    pool: any;
+    dbhan: DatabaseHandle;
     driver: EngineDriver;
     structure: DatabaseInfo;
     modifications: DatabaseModification[];
@@ -9,7 +9,7 @@ export declare class DatabaseAnalyser {
     singleObjectId: string;
     dialect: SqlDialect;
     logger: Logger;
-    constructor(pool: any, driver: EngineDriver, version: any);
+    constructor(dbhan: DatabaseHandle, driver: EngineDriver, version: any);
     _runAnalysis(): Promise<DatabaseInfo>;
     _getFastSnapshot(): Promise<DatabaseInfo>;
     _computeSingleObjectId(): Promise<void>;
@@ -19,6 +19,7 @@ export declare class DatabaseAnalyser {
     incrementalAnalysis(structure: any): Promise<DatabaseInfo>;
     mergeAnalyseResult(newlyAnalysed: any): any;
     getRequestedObjectPureNames(objectTypeField: any, allPureNames: any): any;
+    getDefaultSchemaNameCondition(): string;
     createQuery(template: any, typeFields: any, replacements?: {}): any;
     processQueryReplacements(query: any, replacements: any): any;
     createQueryCore(template: any, typeFields: any): any;

package/lib/DatabaseAnalyser.js

@@ -18,6 +18,7 @@ const groupBy_1 = __importDefault(require("lodash/groupBy"));
 const pick_1 = __importDefault(require("lodash/pick"));
 const compact_1 = __importDefault(require("lodash/compact"));
 const getLogger_1 = require("./getLogger");
+const schemaInfoTools_1 = require("./schemaInfoTools");
 const logger = (0, getLogger_1.getLogger)('dbAnalyser');
 const STRUCTURE_FIELDS = ['tables', 'collections', 'views', 'matviews', 'functions', 'procedures', 'triggers'];
 const fp_pick = arg => array => (0, pick_1.default)(array, arg);
@@ -37,8 +38,8 @@ function areDifferentRowCounts(db1, db2) {
     return false;
 }
 class DatabaseAnalyser {
-    constructor(pool, driver, version) {
-        this.pool = pool;
+    constructor(dbhan, driver, version) {
+        this.dbhan = dbhan;
         this.driver = driver;
         this.singleObjectId = null;
         this.dialect = ((driver === null || driver === void 0 ? void 0 : driver.dialectByVersion) && (driver === null || driver === void 0 ? void 0 : driver.dialectByVersion(version))) || (driver === null || driver === void 0 ? void 0 : driver.dialect);
@@ -171,8 +172,16 @@ class DatabaseAnalyser {
     // containsObjectIdCondition(typeFields) {
     //   return this.createQueryCore('=OBJECT_ID_CONDITION', typeFields) != ' is not null';
     // }
+    getDefaultSchemaNameCondition() {
+        return 'is not null';
+    }
     createQuery(template, typeFields, replacements = {}) {
-        return this.createQueryCore(this.processQueryReplacements(template, replacements), typeFields);
+        let query = this.createQueryCore(this.processQueryReplacements(template, replacements), typeFields);
+        const dbname = this.dbhan.database;
+        const schemaCondition = (0, schemaInfoTools_1.isCompositeDbName)(dbname)
+            ? `= '${(0, schemaInfoTools_1.splitCompositeDbName)(dbname).schema}' `
+            : ` ${this.getDefaultSchemaNameCondition()} `;
+        return query === null || query === void 0 ? void 0 : query.replace(/=SCHEMA_NAME_CONDITION/g, schemaCondition);
     }
     processQueryReplacements(query, replacements) {
         for (const repl in replacements) {
@@ -232,8 +241,8 @@ class DatabaseAnalyser {
         ];
     }
     feedback(obj) {
-        if (this.pool.feedback) {
-            this.pool.feedback(obj);
+        if (this.dbhan.feedback) {
+            this.dbhan.feedback(obj);
         }
         if (obj && obj.analysingMessage) {
             logger.debug(obj.analysingMessage);
@@ -303,7 +312,7 @@ class DatabaseAnalyser {
                 };
             }
             try {
-                const res = yield this.driver.query(this.pool, sql);
+                const res = yield this.driver.query(this.dbhan, sql);
                 this.logger.debug({ rows: res.rows.length, template }, `Loaded analyser query`);
                 return res;
             }
@@ -324,7 +333,6 @@ class DatabaseAnalyser {
             functions: [],
             procedures: [],
             triggers: [],
-            schemas: [],
         };
     }
     static byTableFilter(table) {

package/lib/SqlDumper.d.ts

@@ -20,6 +20,8 @@ export declare class SqlDumper implements AlterProcessor {
     autoIncrement(): void;
     createDatabase(name: string): void;
     dropDatabase(name: string): void;
+    createSchema(name: string): void;
+    dropSchema(name: string): void;
     specialColumnOptions(column: any): void;
     selectScopeIdentity(table: TableInfo): void;
     columnType(dataType: string): void;

package/lib/SqlDumper.js

@@ -200,6 +200,12 @@ class SqlDumper {
     dropDatabase(name) {
         this.putCmd('^drop ^database %i', name);
     }
+    createSchema(name) {
+        this.putCmd('^create ^schema %i', name);
+    }
+    dropSchema(name) {
+        this.putCmd('^drop ^schema %i', name);
+    }
     specialColumnOptions(column) { }
     selectScopeIdentity(table) { }
     columnType(dataType) {

package/lib/alterPlan.js

@@ -171,32 +171,37 @@ class AlterPlan {
                 ];
                 return res;
             }
-            if (op.operationType == 'changeColumn') {
-                const constraints = this._getDependendColumnConstraints(op.oldObject, this.dialect.changeColumnDependencies);
-                if (constraints.length > 0 && this.opts.noDropConstraint) {
-                    return [];
-                }
-                const res = [
-                    ...constraints.map(oldObject => {
-                        const opRes = {
-                            operationType: 'dropConstraint',
-                            oldObject,
-                        };
-                        return opRes;
-                    }),
-                    op,
-                    ...lodash_1.default.reverse([...constraints]).map(newObject => {
-                        const opRes = {
-                            operationType: 'createConstraint',
-                            newObject,
-                        };
-                        return opRes;
-                    }),
-                ];
-                if (constraints.length > 0) {
-                    this.recreates.constraints += 1;
+            for (const [testedOperationType, testedDependencies, testedObject] of [
+                ['changeColumn', this.dialect.changeColumnDependencies, op.oldObject],
+                ['renameColumn', this.dialect.renameColumnDependencies, op.object],
+            ]) {
+                if (op.operationType == testedOperationType) {
+                    const constraints = this._getDependendColumnConstraints(testedObject, testedDependencies);
+                    if (constraints.length > 0 && this.opts.noDropConstraint) {
+                        return [];
+                    }
+                    const res = [
+                        ...constraints.map(oldObject => {
+                            const opRes = {
+                                operationType: 'dropConstraint',
+                                oldObject,
+                            };
+                            return opRes;
+                        }),
+                        op,
+                        ...lodash_1.default.reverse([...constraints]).map(newObject => {
+                            const opRes = {
+                                operationType: 'createConstraint',
+                                newObject,
+                            };
+                            return opRes;
+                        }),
+                    ];
+                    if (constraints.length > 0) {
+                        this.recreates.constraints += 1;
+                    }
+                    return res;
                 }
-                return res;
             }
             if (op.operationType == 'dropTable') {
                 return [
@@ -238,7 +243,8 @@ class AlterPlan {
                 this._testTableRecreate(op, 'dropColumn', this.dialect.dropColumn, 'oldObject') ||
                 this._testTableRecreate(op, 'createConstraint', obj => this._canCreateConstraint(obj), 'newObject') ||
                 this._testTableRecreate(op, 'dropConstraint', obj => this._canDropConstraint(obj), 'oldObject') ||
-                this._testTableRecreate(op, 'changeColumn', this.dialect.changeColumn, 'newObject') || [op]);
+                this._testTableRecreate(op, 'changeColumn', this.dialect.changeColumn, 'newObject') ||
+                this._testTableRecreate(op, 'renameColumn', true, 'object') || [op]);
         });
         return lodash_1.default.flatten(lists);
     }
@@ -317,7 +323,7 @@ class AlterPlan {
             }
             else {
                 // @ts-ignore
-                const oldObject = op.oldObject;
+                const oldObject = op.oldObject || op.object;
                 if (oldObject) {
                     const recreated = recreates[`${oldObject.schemaName}||${oldObject.pureName}`];
                     if (recreated) {

package/lib/createBulkInsertStreamBase.d.ts

@@ -1,2 +1,2 @@
 import { EngineDriver, WriteTableOptions } from 'dbgate-types';
-export declare function createBulkInsertStreamBase(driver: EngineDriver, stream: any, pool: any, name: any, options: WriteTableOptions): any;
+export declare function createBulkInsertStreamBase(driver: EngineDriver, stream: any, dbhan: any, name: any, options: WriteTableOptions): any;

package/lib/createBulkInsertStreamBase.js

@@ -17,7 +17,7 @@ const intersection_1 = __importDefault(require("lodash/intersection"));
 const getLogger_1 = require("./getLogger");
 const tableTransforms_1 = require("./tableTransforms");
 const logger = (0, getLogger_1.getLogger)('bulkStreamBase');
-function createBulkInsertStreamBase(driver, stream, pool, name, options) {
+function createBulkInsertStreamBase(driver, stream, dbhan, name, options) {
     const fullNameQuoted = name.schemaName
         ? `${driver.dialect.quoteIdentifier(name.schemaName)}.${driver.dialect.quoteIdentifier(name.pureName)}`
         : driver.dialect.quoteIdentifier(name.pureName);
@@ -38,21 +38,22 @@ function createBulkInsertStreamBase(driver, stream, pool, name, options) {
         }
     });
     writable.checkStructure = () => __awaiter(this, void 0, void 0, function* () {
-        let structure = yield driver.analyseSingleTable(pool, name);
+        let structure = yield driver.analyseSingleTable(dbhan, name);
         // console.log('ANALYSING', name, structure);
         if (structure && options.dropIfExists) {
             logger.info(`Dropping table ${fullNameQuoted}`);
-            yield driver.script(pool, `DROP TABLE ${fullNameQuoted}`);
+            yield driver.script(dbhan, `DROP TABLE ${fullNameQuoted}`);
         }
         if (options.createIfNotExists && (!structure || options.dropIfExists)) {
             const dmp = driver.createDumper();
-            dmp.createTable((0, tableTransforms_1.prepareTableForImport)(Object.assign(Object.assign({}, writable.structure), name)));
+            const createdTableInfo = driver.adaptTableInfo((0, tableTransforms_1.prepareTableForImport)(Object.assign(Object.assign({}, writable.structure), name)));
+            dmp.createTable(createdTableInfo);
             logger.info({ sql: dmp.s }, `Creating table ${fullNameQuoted}`);
-            yield driver.script(pool, dmp.s);
-            structure = yield driver.analyseSingleTable(pool, name);
+            yield driver.script(dbhan, dmp.s);
+            structure = yield driver.analyseSingleTable(dbhan, name);
         }
         if (options.truncate) {
-            yield driver.script(pool, `TRUNCATE TABLE ${fullNameQuoted}`);
+            yield driver.script(dbhan, `TRUNCATE TABLE ${fullNameQuoted}`);
         }
         writable.columnNames = (0, intersection_1.default)(structure.columns.map(x => x.columnName), writable.structure.columns.map(x => x.columnName));
     });
@@ -76,7 +77,7 @@ function createBulkInsertStreamBase(driver, stream, pool, name, options) {
             dmp.putRaw(';');
             // require('fs').writeFileSync('/home/jena/test.sql', dmp.s);
             // console.log(dmp.s);
-            yield driver.query(pool, dmp.s, { discardResult: true });
+            yield driver.query(dbhan, dmp.s, { discardResult: true });
         }
         else {
             for (const row of rows) {
@@ -87,13 +88,13 @@ function createBulkInsertStreamBase(driver, stream, pool, name, options) {
                 dmp.putRaw('(');
                 dmp.putCollection(',', writable.columnNames, col => dmp.putValue(row[col]));
                 dmp.putRaw(')');
-                yield driver.query(pool, dmp.s, { discardResult: true });
+                yield driver.query(dbhan, dmp.s, { discardResult: true });
             }
         }
         if (options.commitAfterInsert) {
             const dmp = driver.createDumper();
             dmp.commitTransaction();
-            yield driver.query(pool, dmp.s, { discardResult: true });
+            yield driver.query(dbhan, dmp.s, { discardResult: true });
         }
     });
     writable.sendIfFull = () => __awaiter(this, void 0, void 0, function* () {

package/lib/driverBase.d.ts

@@ -27,7 +27,7 @@ export declare const driverBase: {
     analyseIncremental(pool: any, structure: any, version: any): Promise<any>;
     createDumper(options?: any): SqlDumper;
     script(pool: any, sql: any, options: RunScriptOptions): Promise<void>;
-    operation(pool: any, operation: any, options: RunScriptOptions): Promise<never>;
+    operation(pool: any, operation: any, options: RunScriptOptions): Promise<void>;
     getNewObjectTemplates(): {
         label: string;
         sql: string;
@@ -47,4 +47,6 @@ export declare const driverBase: {
         parseHexAsBuffer: boolean;
     };
     createSaveChangeSetScript(changeSet: any, dbinfo: any, defaultCreator: any): any;
+    adaptTableInfo(table: any): any;
+    listSchemas(pool: any): Promise<any>;
 };

package/lib/driverBase.js

@@ -89,7 +89,7 @@ exports.driverBase = {
             }
             for (const sqlItem of (0, dbgate_query_splitter_1.splitQuery)(sql, this.getQuerySplitterOptions('script'))) {
                 try {
-                    yield this.query(pool, sqlItem, { discardResult: true });
+                    yield this.query(pool, sqlItem, Object.assign({ discardResult: true }, options === null || options === void 0 ? void 0 : options.queryOptions));
                 }
                 catch (err) {
                     if ((options === null || options === void 0 ? void 0 : options.useTransaction) && this.supportsTransactions) {
@@ -105,7 +105,17 @@ exports.driverBase = {
     },
     operation(pool, operation, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            throw new Error('Operation not defined in target driver');
+            const { type } = operation;
+            switch (type) {
+                case 'createSchema':
+                    yield runCommandOnDriver(pool, this, dmp => dmp.createSchema(operation.schemaName));
+                    break;
+                case 'dropSchema':
+                    yield runCommandOnDriver(pool, this, dmp => dmp.dropSchema(operation.schemaName));
+                    break;
+                default:
+                    throw new Error(`Operation type ${type} not supported`);
+            }
         });
     },
     getNewObjectTemplates() {
@@ -194,4 +204,12 @@ exports.driverBase = {
     createSaveChangeSetScript(changeSet, dbinfo, defaultCreator) {
         return defaultCreator(changeSet, dbinfo);
     },
+    adaptTableInfo(table) {
+        return table;
+    },
+    listSchemas(pool) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return null;
+        });
+    },
 };

package/lib/index.d.ts

@@ -23,3 +23,4 @@ export * from './getLogger';
 export * from './getConnectionLabel';
 export * from './detectSqlFilterBehaviour';
 export * from './filterBehaviours';
+export * from './schemaInfoTools';

package/lib/index.js

@@ -39,3 +39,4 @@ __exportStar(require("./getLogger"), exports);
 __exportStar(require("./getConnectionLabel"), exports);
 __exportStar(require("./detectSqlFilterBehaviour"), exports);
 __exportStar(require("./filterBehaviours"), exports);
+__exportStar(require("./schemaInfoTools"), exports);

package/lib/schemaInfoTools.d.ts

@@ -0,0 +1,9 @@
+import { SchemaInfo, SqlDialect } from 'dbgate-types';
+export declare function findDefaultSchema(schemaList: SchemaInfo[], dialect: SqlDialect, schemaInStorage?: string): string;
+export declare function isCompositeDbName(name: string): boolean;
+export declare function splitCompositeDbName(name: string): {
+    database: string;
+    schema: string;
+};
+export declare function extractDbNameFromComposite(name: string): string;
+export declare function extractSchemaNameFromComposite(name: string): string;

package/lib/schemaInfoTools.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractSchemaNameFromComposite = exports.extractDbNameFromComposite = exports.splitCompositeDbName = exports.isCompositeDbName = exports.findDefaultSchema = void 0;
+function findDefaultSchema(schemaList, dialect, schemaInStorage = null) {
+    var _a;
+    if (!schemaList) {
+        return null;
+    }
+    if (schemaInStorage && schemaList.find(x => x.schemaName == schemaInStorage)) {
+        return schemaInStorage;
+    }
+    const dynamicDefaultSchema = schemaList.find(x => x.isDefault);
+    if (dynamicDefaultSchema) {
+        return dynamicDefaultSchema.schemaName;
+    }
+    if ((dialect === null || dialect === void 0 ? void 0 : dialect.defaultSchemaName) && schemaList.find(x => x.schemaName == dialect.defaultSchemaName)) {
+        return dialect.defaultSchemaName;
+    }
+    return (_a = schemaList[0]) === null || _a === void 0 ? void 0 : _a.schemaName;
+}
+exports.findDefaultSchema = findDefaultSchema;
+function isCompositeDbName(name) {
+    return name === null || name === void 0 ? void 0 : name.includes('::');
+}
+exports.isCompositeDbName = isCompositeDbName;
+function splitCompositeDbName(name) {
+    if (!isCompositeDbName(name))
+        return null;
+    const [database, schema] = name.split('::');
+    return { database, schema };
+}
+exports.splitCompositeDbName = splitCompositeDbName;
+function extractDbNameFromComposite(name) {
+    return isCompositeDbName(name) ? splitCompositeDbName(name).database : name;
+}
+exports.extractDbNameFromComposite = extractDbNameFromComposite;
+function extractSchemaNameFromComposite(name) {
+    var _a;
+    return (_a = splitCompositeDbName(name)) === null || _a === void 0 ? void 0 : _a.schema;
+}
+exports.extractSchemaNameFromComposite = extractSchemaNameFromComposite;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.4.5-alpha.5",
+  "version": "5.5.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": "^5.4.5-alpha.5",
+    "dbgate-types": "^5.5.1",
     "jest": "^24.9.0",
     "ts-jest": "^25.2.1",
     "typescript": "^4.4.3"
   },
   "dependencies": {
     "dbgate-query-splitter": "^4.10.3",
-    "dbgate-sqltree": "^5.4.5-alpha.5",
+    "dbgate-sqltree": "^5.5.1",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",