f.spilla/typeorm-model-generator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix generation of duplicate field names

Browse Source
This commit is contained in:
Kononnable 2019-11-10 13:33:05 +01:00
parent 06a28b70ae
commit 396a461626
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Utils.ts
View File

@ -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 (