@ContainerKey now respected on foreign column fields such that

it references the whole object by that key
BenLorenzo · Jul 3, 2015 · 22a3281 · 22a3281
1 parent 2bae8af
commit 22a3281
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...iler/src/main/java/com/raizlabs/android/dbflow/processor/definition/ColumnDefinition.java b/...iler/src/main/java/com/raizlabs/android/dbflow/processor/definition/ColumnDefinition.java
@@ -307,7 +307,7 @@ public void writeSaveDefinition(JavaWriter javaWriter, boolean isModelContainerA
                 javaWriter.emitStatement("ModelContainer %1s = %1s.getInstance(%1s.getValue(\"%1s\"), %1s.class)",
                                          modelDefinition,
                                          ModelUtils.getVariable(true), ModelUtils.getVariable(true),
-                                         columnFieldName,
+                                         containerKeyName,
                                          foreignKeyTableClassName);
             } else {
                 javaWriter.beginControlFlow("if (%1s != null)", modelDefinition);
@@ -458,11 +458,11 @@ public void writeLoadFromCursorDefinition(BaseTableDefinition tableDefinition, J
 
                 if (isModelContainerAdapter && isModel) {
                     javaWriter.emitStatement("%1s.put(\"%1s\",%1s.getData())", ModelUtils.getVariable(true),
-                                             columnFieldName, modelContainerName);
+                                             containerKeyName, modelContainerName);
                     javaWriter.nextControlFlow("else");
 
                     javaWriter.emitStatement("%1s.put(\"%1s\", null)", ModelUtils.getVariable(true),
-                                             columnFieldName);
+                                             containerKeyName);
                 }
 
                 javaWriter.endControlFlow();

diff --git a/DBFlow/src/androidTest/java/com/raizlabs/android/dbflow/test/AQL.java b/DBFlow/src/androidTest/java/com/raizlabs/android/dbflow/test/AQL.java
@@ -1,6 +1,7 @@
 package com.raizlabs.android.dbflow.test;
 
 import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ContainerKey;
 import com.raizlabs.android.dbflow.annotation.ForeignKey;
 import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.ModelContainer;
@@ -37,6 +38,7 @@ public interface Columns {
     @Column(name = Columns.AQL_TIMESTAMP)
     private Date timestamp;
 
+    @ContainerKey("boxedLodo")
     @Column
     @ForeignKey(references = {@ForeignKeyReference(columnName = "id1", columnType = long.class, foreignColumnName = "id"),
     @ForeignKeyReference(columnName = "id2", columnType = String.class, foreignColumnName = "name")})