Skip to content

Commit

Permalink
Removing the constrain between dataelement and trackedentitydatavalue
Browse files Browse the repository at this point in the history
We need to find a better solution...
  • Loading branch information
josemp10 committed Feb 8, 2018
1 parent 71085a3 commit 21c995d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ ext {
buildToolsVersion: "25.0.2",
minSdkVersion : 15,
targetSdkVersion : 25,
versionCode : 42_1,
versionName : "0.4.2.1-SNAPSHOT"
versionCode : 42_2,
versionName : "0.4.2.2-SNAPSHOT"
]

libraries = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,7 @@ public class DbOpenHelper extends CustomSQLBriteOpenHelper {
" ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED" +
");";

//TODO We need to review the constrain between dataelement and trackedentitydatavalue
private static final String CREATE_TRACKED_ENTITY_DATA_VALUE_TABLE = "CREATE TABLE " +
TrackedEntityDataValueModel.TABLE + " (" +
TrackedEntityDataValueModel.Columns.ID + " INTEGER PRIMARY KEY AUTOINCREMENT," +
Expand All @@ -711,10 +712,10 @@ public class DbOpenHelper extends CustomSQLBriteOpenHelper {
TrackedEntityDataValueModel.Columns.CREATED + " TEXT," +
TrackedEntityDataValueModel.Columns.LAST_UPDATED + " TEXT," +
TrackedEntityDataValueModel.Columns.PROVIDED_ELSEWHERE + " INTEGER," +
" FOREIGN KEY (" + TrackedEntityDataValueModel.Columns.DATA_ELEMENT + ")" +
/*" FOREIGN KEY (" + TrackedEntityDataValueModel.Columns.DATA_ELEMENT + ")" +
" REFERENCES " + DataElementModel.TABLE +
" (" + DataElementModel.Columns.UID + ")" +
" ON DELETE CASCADE, " +
" ON DELETE CASCADE, " +*/
" FOREIGN KEY (" + TrackedEntityDataValueModel.Columns.EVENT + ")" +
" REFERENCES " + EventModel.TABLE + " (" + EventModel.Columns.UID + ")" +
" ON DELETE CASCADE" +
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ org.gradle.jvmargs=-Xmx1536m
# Properties which are consumed by plugins/gradle-mvn-push.gradle plugin.
# They are used for publishing artifact to snapshot repository.

VERSION_NAME=0.4.2.1-SNAPSHOT
VERSION_CODE=42_1
VERSION_NAME=0.4.2.2-SNAPSHOT
VERSION_CODE=42_2
GROUP=org.hisp.dhis

POM_DESCRIPTION=Android SDK for DHIS 2.
Expand Down

0 comments on commit 21c995d

Please sign in to comment.