From 5172a607573f0cb4cf0a34bc5459925e17fd6603 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 5 Mar 2017 16:43:27 +0100 Subject: [PATCH] create a table for repeating event exceptions --- .../calendar/helpers/DBHelper.kt | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt index 980c68220..a8c8a2779 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt @@ -46,10 +46,15 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont private val COL_TYPE_TITLE = "event_type_title" private val COL_TYPE_COLOR = "event_type_color" + private val EXCEPTIONS_TABLE_NAME = "event_repeat_exceptions" + private val COL_EXCEPTION_ID = "event_exception_id" + private val COL_OCCURRENCE_TIMESTAMP = "event_occurrence_timestamp" + private val COL_PARENT_EVENT_ID = "event_parent_id" + private val mDb: SQLiteDatabase = writableDatabase companion object { - private val DB_VERSION = 7 + private val DB_VERSION = 8 val DB_NAME = "events.db" val REGULAR_EVENT_TYPE_ID = 1 @@ -64,10 +69,12 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont override fun onCreate(db: SQLiteDatabase) { db.execSQL("CREATE TABLE $MAIN_TABLE_NAME ($COL_ID INTEGER PRIMARY KEY, $COL_START_TS INTEGER, $COL_END_TS INTEGER, $COL_TITLE TEXT, " + "$COL_DESCRIPTION TEXT, $COL_REMINDER_MINUTES INTEGER, $COL_REMINDER_MINUTES_2 INTEGER, $COL_REMINDER_MINUTES_3 INTEGER, " + - "$COL_IMPORT_ID TEXT, $COL_FLAGS INTEGER, $COL_EVENT_TYPE INTEGER NOT NULL DEFAULT $REGULAR_EVENT_TYPE_ID)") + "$COL_IMPORT_ID TEXT, $COL_FLAGS INTEGER, $COL_EVENT_TYPE INTEGER NOT NULL DEFAULT $REGULAR_EVENT_TYPE_ID, " + + "$COL_PARENT_EVENT_ID INTEGER)") createMetaTable(db) createTypesTable(db) + createExceptionsTable(db) } override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { @@ -97,6 +104,11 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont createTypesTable(db) db.execSQL("ALTER TABLE $MAIN_TABLE_NAME ADD COLUMN $COL_EVENT_TYPE INTEGER NOT NULL DEFAULT $REGULAR_EVENT_TYPE_ID") } + + if (oldVersion < 8) { + db.execSQL("ALTER TABLE $MAIN_TABLE_NAME ADD COLUMN $COL_PARENT_EVENT_ID INTEGER NOT NULL DEFAULT 0") + createExceptionsTable(db) + } } private fun createMetaTable(db: SQLiteDatabase) { @@ -109,6 +121,10 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont addRegularEventType(db) } + private fun createExceptionsTable(db: SQLiteDatabase) { + db.execSQL("CREATE TABLE $EXCEPTIONS_TABLE_NAME ($COL_EXCEPTION_ID INTEGER PRIMARY KEY, $COL_PARENT_EVENT_ID INTEGER, $COL_OCCURRENCE_TIMESTAMP INTEGER)") + } + private fun addRegularEventType(db: SQLiteDatabase) { val regularEvent = context.resources.getString(R.string.regular_event) val eventType = EventType(REGULAR_EVENT_TYPE_ID, regularEvent, context.config.primaryColor)