dbgate-tools 5.1.4 → 5.1.6

package/lib/SqlDumper.d.ts

@@ -1,9 +1,11 @@
-import { ColumnInfo, ConstraintInfo, EngineDriver, ForeignKeyInfo, FunctionInfo, NamedObjectInfo, PrimaryKeyInfo, ProcedureInfo, SqlDialect, TableInfo, TransformType, TriggerInfo, ViewInfo, IndexInfo, UniqueInfo, CheckInfo, AlterProcessor, SqlObjectInfo } from 'dbgate-types';
+import type { ColumnInfo, ConstraintInfo, EngineDriver, ForeignKeyInfo, FunctionInfo, NamedObjectInfo, PrimaryKeyInfo, ProcedureInfo, SqlDialect, TableInfo, TransformType, TriggerInfo, ViewInfo, IndexInfo, UniqueInfo, CheckInfo, AlterProcessor, SqlObjectInfo } from 'dbgate-types';
 export declare class SqlDumper implements AlterProcessor {
     s: string;
     driver: EngineDriver;
     dialect: SqlDialect;
     indentLevel: number;
+    static keywordsCase: string;
+    static convertKeywordCase(keyword: any): string;
     constructor(driver: EngineDriver);
     endCommand(): void;
     putRaw(text: any): void;

package/lib/SqlDumper.js

@@ -18,6 +18,12 @@ class SqlDumper {
         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();
+    }
     endCommand() {
         this.putRaw(';\n');
     }
@@ -42,11 +48,11 @@ class SqlDumper {
         this.putRaw("'");
     }
     putByteArrayValue(value) {
-        this.putRaw('NULL');
+        this.put('^null');
     }
     putValue(value) {
         if (value === null)
-            this.putRaw('NULL');
+            this.put('^null');
         else if (value === true)
             this.putRaw('1');
         else if (value === false)
@@ -62,7 +68,7 @@ class SqlDumper {
         else if ((0, isPlainObject_1.default)(value) || (0, isArray_1.default)(value))
             this.putStringValue(JSON.stringify(value));
         else
-            this.putRaw('NULL');
+            this.put('^null');
     }
     putCmd(format, ...args) {
         this.put(format, ...args);
@@ -83,7 +89,7 @@ class SqlDumper {
             case 'k':
                 {
                     if (value) {
-                        this.putRaw(value.toUpperCase());
+                        this.putRaw(SqlDumper.convertKeywordCase(value));
                     }
                 }
                 break;
@@ -120,7 +126,7 @@ class SqlDumper {
             switch (c) {
                 case '^':
                     while (i < length && format[i].match(/[a-z0-9_]/i)) {
-                        this.putRaw(format[i].toUpperCase());
+                        this.putRaw(SqlDumper.convertKeywordCase(format[i]));
                         i++;
                     }
                     break;
@@ -581,3 +587,4 @@ class SqlDumper {
     }
 }
 exports.SqlDumper = SqlDumper;
+SqlDumper.keywordsCase = 'upperCase';

package/lib/SqlGenerator.d.ts

@@ -1,4 +1,4 @@
-import { DatabaseInfo, EngineDriver, TableInfo } from 'dbgate-types';
+import type { DatabaseInfo, EngineDriver, TableInfo } from 'dbgate-types';
 import { SqlDumper } from './SqlDumper';
 interface SqlGeneratorOptions {
     dropTables: boolean;

package/lib/computeDiffRows.d.ts

@@ -1,5 +1,5 @@
 import { DbDiffOptions, testEqualTables, testEqualSqlObjects } from './diffTools';
-import { DatabaseInfo, EngineDriver, SqlObjectInfo, TableInfo } from 'dbgate-types';
+import type { DatabaseInfo, EngineDriver, SqlObjectInfo, TableInfo } from 'dbgate-types';
 export declare function computeDiffRowsCore(sourceList: any, targetList: any, testEqual: any): any[];
 export declare const DbDiffCompareDefs: {
     tables: {

package/lib/diffTools.d.ts

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

package/lib/nameTools.d.ts

@@ -1,4 +1,4 @@
-import { ColumnInfo, DatabaseInfo, DatabaseInfoObjects, NamedObjectInfo, SqlDialect, TableInfo } from 'dbgate-types';
+import type { ColumnInfo, DatabaseInfo, DatabaseInfoObjects, NamedObjectInfo, SqlDialect, TableInfo } from 'dbgate-types';
 export declare function fullNameFromString(name: any): {
     schemaName: any;
     pureName: any;

package/lib/packageTools.d.ts

@@ -1,4 +1,4 @@
-import { EngineDriver, ExtensionsDirectory } from 'dbgate-types';
+import type { EngineDriver, ExtensionsDirectory } from 'dbgate-types';
 export declare function extractShellApiPlugins(functionName: any, props: any): string[];
 export declare function extractPackageName(name: any): string;
 export declare function extractShellApiFunctionName(functionName: any): string;

package/lib/preloadedRowsTools.d.ts

@@ -1,2 +1,2 @@
-import { DatabaseInfo, EngineDriver } from 'dbgate-types';
+import type { DatabaseInfo, EngineDriver } from 'dbgate-types';
 export declare function enrichWithPreloadedRows(dbModel: DatabaseInfo, dbTarget: DatabaseInfo, conn: any, driver: EngineDriver): Promise<DatabaseInfo>;

package/lib/schemaEditorTools.d.ts

@@ -1,4 +1,4 @@
-import { ColumnInfo, ConstraintInfo, TableInfo } from 'dbgate-types';
+import type { ColumnInfo, ConstraintInfo, TableInfo } from 'dbgate-types';
 export interface EditorColumnInfo extends ColumnInfo {
     isPrimaryKey?: boolean;
 }

package/lib/structureTools.d.ts

@@ -1,6 +1,15 @@
-import { DatabaseInfo, TableInfo, ApplicationDefinition } from 'dbgate-types';
+import type { DatabaseInfo, TableInfo, ApplicationDefinition, ViewInfo, CollectionInfo } 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;
+export declare function isTableInfo(obj: {
+    objectTypeField?: string;
+}): obj is TableInfo;
+export declare function isViewInfo(obj: {
+    objectTypeField?: string;
+}): obj is ViewInfo;
+export declare function isCollectionInfo(obj: {
+    objectTypeField?: string;
+}): obj is CollectionInfo;

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.isTableColumnUnique = exports.extendDatabaseInfoFromApps = exports.extendDatabaseInfo = exports.extendTableInfo = exports.addTableDependencies = void 0;
+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) {
     const allForeignKeys = (0, flatten_1.default)(db.tables.map(x => x.foreignKeys || []));
@@ -45,3 +45,15 @@ function isTableColumnUnique(table, column) {
     return false;
 }
 exports.isTableColumnUnique = isTableColumnUnique;
+function isTableInfo(obj) {
+    return obj.objectTypeField == 'tables';
+}
+exports.isTableInfo = isTableInfo;
+function isViewInfo(obj) {
+    return obj.objectTypeField == 'views';
+}
+exports.isViewInfo = isViewInfo;
+function isCollectionInfo(obj) {
+    return obj.objectTypeField == 'collections';
+}
+exports.isCollectionInfo = isCollectionInfo;

package/lib/tableTransforms.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="lodash" />
-import { TableInfo } from 'dbgate-types';
+import type { TableInfo } from 'dbgate-types';
 export declare function prepareTableForImport(table: TableInfo): TableInfo;
 interface TransformColumnDefinition {
     src: string;

package/package.json

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