dbgate-tools 6.6.9 → 6.6.11

package/lib/nameTools.d.ts

@@ -22,6 +22,7 @@ export declare function findObjectLike({ pureName, schemaName }: {
     schemaName: any;
 }, dbinfo: DatabaseInfo, objectTypeField: keyof DatabaseInfoObjects): any;
 export declare function findForeignKeyForColumn(table: TableInfo, column: ColumnInfo | string): import("dbgate-types").ForeignKeyInfo;
+export declare function getConflictingColumnNames(columns: ColumnInfo[]): Set<string>;
 export declare function makeUniqueColumnNames(res: ColumnInfo[]): void;
 export declare function fillConstraintNames(table: TableInfo, dialect: SqlDialect): TableInfo;
 export declare const DATA_FOLDER_NAMES: {

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.DATA_FOLDER_NAMES = exports.fillConstraintNames = exports.makeUniqueColumnNames = exports.findForeignKeyForColumn = exports.findObjectLike = exports.equalFullName = exports.equalStringLike = exports.quoteFullName = exports.fullNameToLabel = exports.fullNameToString = exports.fullNameFromString = void 0;
+exports.DATA_FOLDER_NAMES = exports.fillConstraintNames = exports.makeUniqueColumnNames = exports.getConflictingColumnNames = 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 uniq_1 = __importDefault(require("lodash/uniq"));
 const isString_1 = __importDefault(require("lodash/isString"));
 function fullNameFromString(name) {
     const m = name.match(/\[([^\]]+)\]\.\[([^\]]+)\]/);
@@ -69,9 +70,22 @@ function findForeignKeyForColumn(table, column) {
     return (table.foreignKeys || []).find(fk => fk.columns.find(col => col.columnName == column.columnName));
 }
 exports.findForeignKeyForColumn = findForeignKeyForColumn;
+function getConflictingColumnNames(columns) {
+    const conflictingNames = new Set((0, uniq_1.default)(columns.map(x => x.columnName).filter((item, index, arr) => arr.indexOf(item) !== index)));
+    return conflictingNames;
+}
+exports.getConflictingColumnNames = getConflictingColumnNames;
 function makeUniqueColumnNames(res) {
     const usedNames = new Set();
+    const conflictingNames = getConflictingColumnNames(res);
     for (let i = 0; i < res.length; i++) {
+        if (conflictingNames.has(res[i].columnName) &&
+            res[i].pureName &&
+            !usedNames.has(`${res[i].pureName}_${res[i].columnName}`)) {
+            res[i].columnName = `${res[i].pureName}_${res[i].columnName}`;
+            usedNames.add(res[i].columnName);
+            continue;
+        }
         if (usedNames.has(res[i].columnName)) {
             let suffix = 2;
             while (usedNames.has(`${res[i].columnName}${suffix}`))

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.6.9",
+  "version": "6.6.11",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,7 +26,7 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^6.6.9",
+    "dbgate-types": "^6.6.11",
     "jest": "^28.1.3",
     "ts-jest": "^28.0.7",
     "typescript": "^4.4.3"
@@ -34,7 +34,7 @@
   "dependencies": {
     "blueimp-md5": "^2.19.0",
     "dbgate-query-splitter": "^4.11.7",
-    "dbgate-sqltree": "^6.6.9",
+    "dbgate-sqltree": "^6.6.11",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",