From 46e9b507f199bbc03da76bc9a810bfbdb2bae671 Mon Sep 17 00:00:00 2001 From: Dominik Date: Wed, 31 Oct 2012 18:00:40 +0100 Subject: fix foreign key definition in create statement --- .../org/thialfihar/android/apg/provider/ApgDatabase.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'org_apg/src/org') diff --git a/org_apg/src/org/thialfihar/android/apg/provider/ApgDatabase.java b/org_apg/src/org/thialfihar/android/apg/provider/ApgDatabase.java index 050320cb6..e25fce3f0 100644 --- a/org_apg/src/org/thialfihar/android/apg/provider/ApgDatabase.java +++ b/org_apg/src/org/thialfihar/android/apg/provider/ApgDatabase.java @@ -50,15 +50,17 @@ public class ApgDatabase extends SQLiteOpenHelper { + " INTEGER, " + KeysColumns.ALGORITHM + " INTEGER, " + KeysColumns.KEY_SIZE + " INTEGER, " + KeysColumns.CAN_SIGN + " INTEGER, " + KeysColumns.CAN_ENCRYPT + " INTEGER, " + KeysColumns.IS_REVOKED + " INTEGER, " + KeysColumns.CREATION - + " INTEGER, " + KeysColumns.EXPIRY + " INTEGER, " + KeysColumns.KEY_RING_ROW_ID - + " INTEGER REFERENCES " + Tables.KEY_RINGS + " ON DELETE CASCADE, " - + KeysColumns.KEY_DATA + " BLOB," + KeysColumns.RANK + " INTEGER)"; + + " INTEGER, " + KeysColumns.EXPIRY + " INTEGER, " + KeysColumns.KEY_DATA + " BLOB," + + KeysColumns.RANK + " INTEGER, " + KeysColumns.KEY_RING_ROW_ID + + " INTEGER NOT NULL, FOREIGN KEY(" + KeysColumns.KEY_RING_ROW_ID + ") REFERENCES " + + Tables.KEY_RINGS + "(" + BaseColumns._ID + ") ON DELETE CASCADE)"; private static final String CREATE_USER_IDS = "CREATE TABLE IF NOT EXISTS " + Tables.USER_IDS + " (" + BaseColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " - + UserIdsColumns.KEY_RING_ROW_ID + " INTEGER REFERENCES " + Tables.KEY_RINGS - + " ON DELETE CASCADE, " + UserIdsColumns.USER_ID + " TEXT, " + UserIdsColumns.RANK - + " INTEGER)"; + + UserIdsColumns.USER_ID + " TEXT, " + UserIdsColumns.RANK + " INTEGER, " + + UserIdsColumns.KEY_RING_ROW_ID + " INTEGER NOT NULL, FOREIGN KEY(" + + UserIdsColumns.KEY_RING_ROW_ID + ") REFERENCES " + Tables.KEY_RINGS + "(" + + BaseColumns._ID + ") ON DELETE CASCADE)"; ApgDatabase(Context context) { super(context, DATABASE_NAME, null, DATABASE_VERSION); -- cgit v1.2.3