1 files changed, 10 insertions, 13 deletions
diff --git a/container-compiler-plugin/src/main/java/io/trygvis/persistence/generators/DaoUtilsGenerator.java b/container-compiler-plugin/src/main/java/io/trygvis/persistence/generators/DaoUtilsGenerator.java
index e4f69b5..08a7f45 100644
--- a/container-compiler-plugin/src/main/java/io/trygvis/persistence/generators/DaoUtilsGenerator.java
+++ b/container-compiler-plugin/src/main/java/io/trygvis/persistence/generators/DaoUtilsGenerator.java
@@ -68,7 +68,7 @@ public class DaoUtilsGenerator {
 
         body.add("try (" + psType + " stmt = " + con.name + ".prepareStatement(insertIntoSql)) {");
         int i = 0;
-        for (FieldMirror field : entity.fields) {
+        for (FieldMirror field : entity.getFields()) {
             // Assume all ID fields are generated for now.
             if (field.id) {
                 continue;
@@ -133,12 +133,11 @@ public class DaoUtilsGenerator {
 
         List<String> arguments = new ArrayList<>();
         arguments.add(con.name);
-        for (FieldMirror field : entity.idFields) {
-            if (field.getterType == GetterType.FIELD) {
-                arguments.add(o.name + "." + field.javaName);
-            } else {
-                arguments.add(o.name + "." + toGetterName(field.javaName) + "()");
-            }
+        FieldMirror field = entity.getIdField();
+        if (field.getterType == GetterType.FIELD) {
+            arguments.add(o.name + "." + field.javaName);
+        } else {
+            arguments.add(o.name + "." + toGetterName(field.javaName) + "()");
         }
 
         return new MethodRef(PUBLIC | STATIC, TypeRef.VOID, "delete" + entity.type.className, p,
@@ -154,12 +153,10 @@ public class DaoUtilsGenerator {
         List<String> body = new ArrayList<>();
 
         body.add("try (" + psType + " stmt = " + con.name + ".prepareStatement(deleteFromSql)) {");
-        for (int i = 0; i < entity.idFields.size(); i++) {
-            FieldMirror field = entity.idFields.get(i);
-            p.addParameter(field.type, field.javaName);
-            TypeHandler typeHandler = generatorConfiguration.typeHandler(field.type);
-            body.add("    stmt." + typeHandler.setter(i + 1, field.javaName) + ";");
-        }
+        FieldMirror field = entity.getIdField();
+        p.addParameter(field.type, field.javaName);
+        TypeHandler typeHandler = generatorConfiguration.typeHandler(field.type);
+        body.add("    stmt." + typeHandler.setter(1, field.javaName) + ";");
         body.add("    stmt.executeUpdate();");
         body.add("}");