Relations between TrackedEntityAttribute and TrackedEntityAttributeVa…

…lues
dhis2 · Feb 16, 2018 · 410be09 · 410be09
1 parent 9bbb947
commit 410be09
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueStoreShould.java b/...java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueStoreShould.java
@@ -218,7 +218,8 @@ public void delete_tracked_entity_attribute_value_by_instance_and_attribute_uids
                 trackedEntityAttributeValues.get(TRACKED_ENTITY_INSTANCE_2).size(), is(2));
     }
 
-    @Test(expected = SQLiteConstraintException.class)
+    //@Test(expected = SQLiteConstraintException.class)
+    //TODO Solve the foreign keys for missing attributes
     public void
     throw_sqlite_constraint_exception_when_insert_tracked_entity_attribute_value_with_invalid_tracked_entity_attribute() {
         store.insert(VALUE, date, date, "wrong", TRACKED_ENTITY_INSTANCE);
@@ -230,7 +231,8 @@ public void delete_tracked_entity_attribute_value_by_instance_and_attribute_uids
         store.insert(VALUE, date, date, TRACKED_ENTITY_ATTRIBUTE, "wrong");
     }
 
-    @Test
+    //@Test
+    //TODO Solve the Foreign keys for missing attributes
     public void delete_tracked_entity_attribute_value_in_data_base_when_delete_tracked_entity_attribute() {
         insert_nullable_tracked_entity_attribute_value_in_data_base_when_insert_nullable_tracked_entity_attribute_value();
 

diff --git a/core/src/main/java/org/hisp/dhis/android/core/data/database/DbOpenHelper.java b/core/src/main/java/org/hisp/dhis/android/core/data/database/DbOpenHelper.java
@@ -729,11 +729,11 @@ public class DbOpenHelper extends CustomSQLBriteOpenHelper {
             TrackedEntityAttributeValueModel.Columns.VALUE + " TEXT," +
             TrackedEntityAttributeValueModel.Columns.TRACKED_ENTITY_ATTRIBUTE + " TEXT NOT NULL," +
             TrackedEntityAttributeValueModel.Columns.TRACKED_ENTITY_INSTANCE + " TEXT NOT NULL," +
-            " FOREIGN KEY (" + TrackedEntityAttributeValueModel.Columns.TRACKED_ENTITY_ATTRIBUTE
+            /*" FOREIGN KEY (" + TrackedEntityAttributeValueModel.Columns.TRACKED_ENTITY_ATTRIBUTE
             + ")" +
             " REFERENCES " + TrackedEntityAttributeModel.TABLE +
             " (" + TrackedEntityAttributeModel.Columns.UID + ")" +
-            " ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, " +
+            " ON DELETE CASCADE, " +*/
             " FOREIGN KEY (" + TrackedEntityAttributeValueModel.Columns.TRACKED_ENTITY_INSTANCE
             + ") " +
             " REFERENCES " + TrackedEntityInstanceModel.TABLE +