dbgate-tools 5.2.7 → 5.2.9

package/lib/DatabaseAnalyser.d.ts

@@ -1,4 +1,5 @@
 import { DatabaseInfo, DatabaseModification, EngineDriver, SqlDialect } from 'dbgate-types';
+import { type Logger } from 'pinomin';
 export declare class DatabaseAnalyser {
     pool: any;
     driver: EngineDriver;
@@ -7,6 +8,7 @@ export declare class DatabaseAnalyser {
     singleObjectFilter: any;
     singleObjectId: string;
     dialect: SqlDialect;
+    logger: Logger;
     constructor(pool: any, driver: EngineDriver, version: any);
     _runAnalysis(): Promise<DatabaseInfo>;
     _getFastSnapshot(): Promise<DatabaseInfo>;

package/lib/DatabaseAnalyser.js

@@ -42,6 +42,7 @@ class DatabaseAnalyser {
         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);
+        this.logger = logger;
     }
     _runAnalysis() {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/SqlDumper.js

@@ -12,18 +12,18 @@ 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) {
-        this.s = '';
-        this.indentLevel = 0;
-        this.driver = driver;
-        this.dialect = driver.dialect;
-    }
     static convertKeywordCase(keyword) {
         var _a, _b;
         if (this.keywordsCase == 'lowerCase')
             return (_a = keyword === null || keyword === void 0 ? void 0 : keyword.toString()) === null || _a === void 0 ? void 0 : _a.toLowerCase();
         return (_b = keyword === null || keyword === void 0 ? void 0 : keyword.toString()) === null || _b === void 0 ? void 0 : _b.toUpperCase();
     }
+    constructor(driver) {
+        this.s = '';
+        this.indentLevel = 0;
+        this.driver = driver;
+        this.dialect = driver.dialect;
+    }
     endCommand() {
         this.putRaw(';\n');
     }
@@ -192,7 +192,16 @@ class SqlDumper {
                 this.put(' ^persisted');
             return;
         }
-        this.put('%k', column.dataType || this.dialect.fallbackDataType);
+        const type = column.dataType || this.dialect.fallbackDataType;
+        const typeWithValues = type.match(/([^(]+)(\(.+[^)]\))/);
+        if (typeWithValues === null || typeWithValues === void 0 ? void 0 : typeWithValues.length) {
+            typeWithValues.shift();
+            this.putRaw(SqlDumper.convertKeywordCase(typeWithValues.shift()));
+            this.putRaw(typeWithValues);
+        }
+        else {
+            this.putRaw(SqlDumper.convertKeywordCase(type));
+        }
         if (column.autoIncrement) {
             this.autoIncrement();
         }

package/lib/alterPlan.d.ts

@@ -70,7 +70,7 @@ interface AlterOperation_FillPreloadedRows {
     key: string[];
     insertOnly: string[];
 }
-declare type AlterOperation = AlterOperation_CreateColumn | AlterOperation_ChangeColumn | AlterOperation_DropColumn | AlterOperation_CreateConstraint | AlterOperation_ChangeConstraint | AlterOperation_DropConstraint | AlterOperation_CreateTable | AlterOperation_DropTable | AlterOperation_RenameTable | AlterOperation_RenameColumn | AlterOperation_RenameConstraint | AlterOperation_CreateSqlObject | AlterOperation_DropSqlObject | AlterOperation_RecreateTable | AlterOperation_FillPreloadedRows;
+type AlterOperation = AlterOperation_CreateColumn | AlterOperation_ChangeColumn | AlterOperation_DropColumn | AlterOperation_CreateConstraint | AlterOperation_ChangeConstraint | AlterOperation_DropConstraint | AlterOperation_CreateTable | AlterOperation_DropTable | AlterOperation_RenameTable | AlterOperation_RenameColumn | AlterOperation_RenameConstraint | AlterOperation_CreateSqlObject | AlterOperation_DropSqlObject | AlterOperation_RecreateTable | AlterOperation_FillPreloadedRows;
 export declare class AlterPlan {
     wholeOldDb: DatabaseInfo;
     wholeNewDb: DatabaseInfo;

package/lib/diffTools.d.ts

@@ -1,6 +1,6 @@
 import type { ColumnInfo, DatabaseInfo, EngineDriver, SqlObjectInfo, TableInfo } from 'dbgate-types';
 import { AlterPlan } from './alterPlan';
-declare type DbDiffSchemaMode = 'strict' | 'ignore' | 'ignoreImplicit';
+type DbDiffSchemaMode = 'strict' | 'ignore' | 'ignoreImplicit';
 export interface DbDiffOptions {
     ignoreCase?: boolean;
     schemaMode?: DbDiffSchemaMode;

package/lib/getLogger.d.ts

@@ -1,4 +1,4 @@
-import { Logger } from 'pinomin';
-export declare function setLogger(value: Logger): void;
+import { Logger, type LogConfig } from 'pinomin';
+export declare function setLogConfig(value: LogConfig): void;
 export declare function setLoggerName(value: any): void;
 export declare function getLogger(caller?: string): Logger;

package/lib/getLogger.js

@@ -4,31 +4,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLogger = exports.setLoggerName = exports.setLogger = void 0;
+exports.getLogger = exports.setLoggerName = exports.setLogConfig = void 0;
 const pinomin_1 = __importDefault(require("pinomin"));
-let _logger;
+let _logConfig;
 let _name = null;
-const defaultLogger = (0, pinomin_1.default)({
+const defaultLogConfig = {
     base: { pid: (_a = global === null || global === void 0 ? void 0 : global.process) === null || _a === void 0 ? void 0 : _a.pid },
     targets: [{ type: 'console', level: 'info' }],
-});
-function setLogger(value) {
-    _logger = value;
+};
+function setLogConfig(value) {
+    _logConfig = value;
 }
-exports.setLogger = setLogger;
+exports.setLogConfig = setLogConfig;
 function setLoggerName(value) {
     _name = value;
 }
 exports.setLoggerName = setLoggerName;
 function getLogger(caller) {
-    let res = _logger || defaultLogger;
-    if (caller) {
-        const props = { caller };
-        if (_name) {
-            props['name'] = _name;
-        }
-        res = res.child(props);
-    }
-    return res;
+    return (0, pinomin_1.default)({
+        getConfig: () => {
+            const config = _logConfig || defaultLogConfig;
+            if (caller) {
+                const props = { caller };
+                if (_name) {
+                    props['name'] = _name;
+                }
+                return Object.assign(Object.assign({}, config), { base: Object.assign(Object.assign({}, config.base), props) });
+            }
+            return config;
+        },
+    });
 }
 exports.getLogger = getLogger;

package/lib/structureTools.js

@@ -6,6 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isCollectionInfo = exports.isViewInfo = exports.isTableInfo = exports.isTableColumnUnique = exports.extendDatabaseInfoFromApps = exports.extendDatabaseInfo = exports.extendTableInfo = exports.addTableDependencies = void 0;
 const flatten_1 = __importDefault(require("lodash/flatten"));
 function addTableDependencies(db) {
+    if (!db.tables) {
+        return db;
+    }
     const allForeignKeys = (0, flatten_1.default)(db.tables.map(x => x.foreignKeys || []));
     return Object.assign(Object.assign({}, db), { tables: db.tables.map(table => (Object.assign(Object.assign({}, table), { dependencies: allForeignKeys.filter(x => x.refSchemaName == table.schemaName && x.refTableName == table.pureName) }))) });
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.2.7",
+  "version": "5.2.9",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -25,18 +25,18 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^5.2.7",
+    "dbgate-types": "^5.2.9",
     "jest": "^24.9.0",
     "ts-jest": "^25.2.1",
     "typescript": "^4.4.3"
   },
   "dependencies": {
     "dbgate-query-splitter": "^4.9.3",
-    "dbgate-sqltree": "^5.2.7",
+    "dbgate-sqltree": "^5.2.9",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",
-    "pinomin": "^1.0.1",
+    "pinomin": "^1.0.4",
     "uuid": "^3.4.0"
   }
 }