From 396a461626e4e1e73d735b0eb9f53448c2586337 Mon Sep 17 00:00:00 2001 From: Kononnable Date: Sun, 10 Nov 2019 13:33:05 +0100 Subject: [PATCH] fix generation of duplicate field names --- src/Utils.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Utils.ts b/src/Utils.ts index 2556fc8..af39d98 100644 --- a/src/Utils.ts +++ b/src/Utils.ts @@ -1,3 +1,4 @@ +import * as changeCase from "change-case"; import * as packagejson from "../package.json"; import { Entity } from "./models/Entity"; @@ -31,16 +32,23 @@ export function findNameForNewField( let fieldName = _fieldName; const validNameCondition = () => (entity.columns.every( - v => v.tscName.toLowerCase() !== fieldName.toLowerCase() + v => + changeCase.camelCase(v.tscName) !== + changeCase.camelCase(fieldName) ) && entity.relations.every( - v => v.fieldName.toLowerCase() !== fieldName.toLowerCase() + v => + changeCase.camelCase(v.fieldName) !== + changeCase.camelCase(fieldName) ) && entity.relationIds.every( - v => v.fieldName.toLowerCase() !== fieldName.toLowerCase() + v => + changeCase.camelCase(v.fieldName) !== + changeCase.camelCase(fieldName) )) || (columnOldName && - columnOldName.toLowerCase() === fieldName.toLowerCase()); + changeCase.camelCase(columnOldName) === + changeCase.camelCase(fieldName)); if (!validNameCondition()) { fieldName += "_"; for (