diff options
| author | Chulwoo Lee <chulwoo@google.com> | 2016-04-12 18:28:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-12 18:28:09 +0000 |
| commit | e98791890461274af70882bff6d1193da7d749b1 (patch) | |
| tree | f6211cb090f8fe8378a8435eeeb14bce168242b6 | |
| parent | f8c2a420b1b875ffeae7f9de9cd7a87f5d3591bc (diff) | |
| parent | b5fb0ab500fe4dcb3dbd95b58cc91de4c7d91e71 (diff) | |
| download | TvProvider-e98791890461274af70882bff6d1193da7d749b1.tar.gz | |
Merge "Set recorded_programs.channel_id as the foreign key of channels._id" into nyc-dev
| -rw-r--r-- | src/com/android/providers/tv/TvProvider.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/com/android/providers/tv/TvProvider.java b/src/com/android/providers/tv/TvProvider.java index 58578f0..2261220 100644 --- a/src/com/android/providers/tv/TvProvider.java +++ b/src/com/android/providers/tv/TvProvider.java @@ -81,7 +81,7 @@ public class TvProvider extends ContentProvider { private static final String OP_UPDATE = "update"; private static final String OP_DELETE = "delete"; - static final int DATABASE_VERSION = 29; + static final int DATABASE_VERSION = 30; private static final String DATABASE_NAME = "tv.db"; private static final String CHANNELS_TABLE = "channels"; private static final String PROGRAMS_TABLE = "programs"; @@ -376,7 +376,10 @@ public class TvProvider extends ContentProvider { + RecordedPrograms.COLUMN_INTERNAL_PROVIDER_FLAG2 + " INTEGER," + RecordedPrograms.COLUMN_INTERNAL_PROVIDER_FLAG3 + " INTEGER," + RecordedPrograms.COLUMN_INTERNAL_PROVIDER_FLAG4 + " INTEGER," - + RecordedPrograms.COLUMN_VERSION_NUMBER + " INTEGER);"; + + RecordedPrograms.COLUMN_VERSION_NUMBER + " INTEGER," + + "FOREIGN KEY(" + RecordedPrograms.COLUMN_CHANNEL_ID + ") " + + "REFERENCES " + CHANNELS_TABLE + "(" + Channels._ID + ") " + + "ON UPDATE CASCADE ON DELETE SET NULL);"; static class DatabaseHelper extends SQLiteOpenHelper { private static DatabaseHelper sSingleton = null; @@ -558,18 +561,19 @@ public class TvProvider extends ContentProvider { oldVersion++; } if (oldVersion <= 28) { - db.execSQL("DROP TABLE IF EXISTS " + RECORDED_PROGRAMS_TABLE); - db.execSQL(CREATE_RECORDED_PROGRAMS_TABLE_SQL); - db.execSQL("ALTER TABLE " + PROGRAMS_TABLE + " ADD " + Programs.COLUMN_SEASON_TITLE + " TEXT;"); - migrateIntegerColumnToTextColumn(db, PROGRAMS_TABLE, Programs.COLUMN_SEASON_NUMBER, Programs.COLUMN_SEASON_DISPLAY_NUMBER); migrateIntegerColumnToTextColumn(db, PROGRAMS_TABLE, Programs.COLUMN_EPISODE_NUMBER, Programs.COLUMN_EPISODE_DISPLAY_NUMBER); oldVersion = 29; } + if (oldVersion == 29) { + db.execSQL("DROP TABLE IF EXISTS " + RECORDED_PROGRAMS_TABLE); + db.execSQL(CREATE_RECORDED_PROGRAMS_TABLE_SQL); + oldVersion = 30; + } Log.i(TAG, "Upgrading from version " + oldVersion + " to " + newVersion + " is done."); } |