Only use default uuid relation field when id field name isn't id

JanHolger · JanHolger · commit 615dd75f391a · 2021-07-23T18:11:27.000+02:00
diff --git a/src/main/java/org/javawebstack/orm/TableInfo.java b/src/main/java/org/javawebstack/orm/TableInfo.java
@@ -113,7 +113,7 @@ public TableInfo(Class<? extends Model> model, ORMConfig config) throws ORMConfi
         if (model.isAnnotationPresent(RelationField.class)) {
             relationField = model.getDeclaredAnnotationsByType(RelationField.class)[0].value();
         } else {
-            relationField = Helper.pascalToCamelCase(model.getSimpleName()) + (getIdType().equals(UUID.class) ? "UUID" : "Id");
+            relationField = Helper.pascalToCamelCase(model.getSimpleName()) + ((getIdType().equals(UUID.class) && !idField.equalsIgnoreCase("id")) ? "UUID" : "Id");
         }
         if (config.isIdPrimaryKey()) {
             if (primaryKey == null)

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public TableInfo(Class<? extends Model> model, ORMConfig config) throws ORMConfi`
`113`	`113`	`if (model.isAnnotationPresent(RelationField.class)) {`
`114`	`114`	`relationField = model.getDeclaredAnnotationsByType(RelationField.class)[0].value();`
`115`	`115`	`} else {`
`116`		`- relationField = Helper.pascalToCamelCase(model.getSimpleName()) + (getIdType().equals(UUID.class) ? "UUID" : "Id");`
	`116`	`+ relationField = Helper.pascalToCamelCase(model.getSimpleName()) + ((getIdType().equals(UUID.class) && !idField.equalsIgnoreCase("id")) ? "UUID" : "Id");`
`117`	`117`	`}`
`118`	`118`	`if (config.isIdPrimaryKey()) {`
`119`	`119`	`if (primaryKey == null)`