dbgate-tools 5.0.8 → 5.1.1

package/lib/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/nameTools.d.ts

@@ -1,4 +1,4 @@
-import { ColumnInfo, DatabaseInfo, DatabaseInfoObjects, SqlDialect, TableInfo } from 'dbgate-types';
+import { ColumnInfo, DatabaseInfo, DatabaseInfoObjects, NamedObjectInfo, SqlDialect, TableInfo } from 'dbgate-types';
 export declare function fullNameFromString(name: any): {
     schemaName: any;
     pureName: any;
@@ -16,10 +16,11 @@ export declare function quoteFullName(dialect: any, { schemaName, pureName }: {
     pureName: any;
 }): string;
 export declare function equalStringLike(s1: any, s2: any): boolean;
+export declare function equalFullName(name1: NamedObjectInfo, name2: NamedObjectInfo): boolean;
 export declare function findObjectLike({ pureName, schemaName }: {
     pureName: any;
     schemaName: any;
 }, dbinfo: DatabaseInfo, objectTypeField: keyof DatabaseInfoObjects): import("dbgate-types").CollectionInfo;
-export declare function findForeignKeyForColumn(table: TableInfo, column: ColumnInfo): import("dbgate-types").ForeignKeyInfo;
+export declare function findForeignKeyForColumn(table: TableInfo, column: ColumnInfo | string): import("dbgate-types").ForeignKeyInfo;
 export declare function makeUniqueColumnNames(res: ColumnInfo[]): void;
 export declare function fillConstraintNames(table: TableInfo, dialect: SqlDialect): TableInfo;

package/lib/nameTools.js

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fillConstraintNames = exports.makeUniqueColumnNames = exports.findForeignKeyForColumn = exports.findObjectLike = exports.equalStringLike = exports.quoteFullName = exports.fullNameToLabel = exports.fullNameToString = exports.fullNameFromString = void 0;
-const lodash_1 = __importDefault(require("lodash"));
+exports.fillConstraintNames = exports.makeUniqueColumnNames = exports.findForeignKeyForColumn = exports.findObjectLike = exports.equalFullName = exports.equalStringLike = exports.quoteFullName = exports.fullNameToLabel = exports.fullNameToString = exports.fullNameFromString = void 0;
+const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
+const isString_1 = __importDefault(require("lodash/isString"));
 function fullNameFromString(name) {
     const m = name.match(/\[([^\]]+)\]\.\[([^\]]+)\]/);
     if (m) {
@@ -43,6 +44,12 @@ function equalStringLike(s1, s2) {
     return (s1 || '').toLowerCase().trim() == (s2 || '').toLowerCase().trim();
 }
 exports.equalStringLike = equalStringLike;
+function equalFullName(name1, name2) {
+    if (!name1 || !name2)
+        return name1 == name2;
+    return name1.pureName == name2.pureName && name1.schemaName == name2.schemaName;
+}
+exports.equalFullName = equalFullName;
 function findObjectLike({ pureName, schemaName }, dbinfo, objectTypeField) {
     var _a, _b;
     if (!dbinfo)
@@ -56,6 +63,9 @@ function findObjectLike({ pureName, schemaName }, dbinfo, objectTypeField) {
 }
 exports.findObjectLike = findObjectLike;
 function findForeignKeyForColumn(table, column) {
+    if ((0, isString_1.default)(column)) {
+        return (table.foreignKeys || []).find(fk => fk.columns.find(col => col.columnName == column));
+    }
     return (table.foreignKeys || []).find(fk => fk.columns.find(col => col.columnName == column.columnName));
 }
 exports.findForeignKeyForColumn = findForeignKeyForColumn;
@@ -78,7 +88,7 @@ function columnsConstraintName(prefix, table, columns) {
 function fillConstraintNames(table, dialect) {
     if (!table)
         return table;
-    const res = lodash_1.default.cloneDeep(table);
+    const res = (0, cloneDeep_1.default)(table);
     if (res.primaryKey && !res.primaryKey.constraintName && !dialect.anonymousPrimaryKey) {
         res.primaryKey.constraintName = `PK_${res.pureName}`;
     }

package/package.json

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