Make database migration ready

- change table names - change database name to existing name haven.db - change database version to existing version 3 - change column names and properties to existing ones (NON NULL to NULL) - change autoGenerate property default values to null due to this Signed-off-by: Arka Prava Basu <arkaprava94@gmail.com>
guardianproject · Jun 10, 2018 · a77960d · a77960d
1 parent 673b636
commit a77960d
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 21 deletions.
diff --git a/src/main/java/org/havenapp/main/dao/EventDAO.kt b/src/main/java/org/havenapp/main/dao/EventDAO.kt
@@ -18,15 +18,15 @@ interface EventDAO {
     @Update
     fun update(event: Event)
 
-    @Query("SELECT * FROM event_table WHERE id = :id")
-    fun findById(id: Long) : Event
+    @Query("SELECT * FROM EVENT WHERE ID = :id")
+    fun findById(id: Long?) : Event
 
-    @Query("SELECT * FROM event_table ORDER BY id")
+    @Query("SELECT * FROM EVENT ORDER BY ID")
     fun getAllEvent() : List<Event>
 
-    @Query("SELECT * FROM event_table ORDER BY id DESC")
+    @Query("SELECT * FROM EVENT ORDER BY ID DESC")
     fun getAllEventDesc() : List<Event>
 
-    @Query("SELECT COUNT(*) FROM event_table")
+    @Query("SELECT COUNT(*) FROM EVENT")
     fun count() : Int
 }
diff --git a/src/main/java/org/havenapp/main/dao/EventTriggerDAO.kt b/src/main/java/org/havenapp/main/dao/EventTriggerDAO.kt
@@ -18,12 +18,12 @@ interface EventTriggerDAO {
     @Update
     fun update(eventTrigger: EventTrigger)
 
-    @Query("SELECT * FROM event_trigger_table WHERE id = :id")
-    fun findById(id : Long) : EventTrigger
+    @Query("SELECT * FROM EVENT_TRIGGER WHERE ID = :id")
+    fun findById(id : Long?) : EventTrigger
 
-    @Query("SELECT * FROM event_trigger_table WHERE mEventId = :eventId")
-    fun getEventTriggerList(eventId: Long) : MutableList<EventTrigger>
+    @Query("SELECT * FROM EVENT_TRIGGER WHERE M_EVENT_ID = :eventId")
+    fun getEventTriggerList(eventId: Long?) : MutableList<EventTrigger>
 
-    @Query("SELECT * FROM event_trigger_table")
+    @Query("SELECT * FROM EVENT_TRIGGER")
     fun getAllEventTriggers() : MutableList<EventTrigger>
 }
diff --git a/src/main/java/org/havenapp/main/database/HavenEventDB.kt b/src/main/java/org/havenapp/main/database/HavenEventDB.kt
@@ -14,7 +14,7 @@ import org.havenapp.main.model.EventTrigger
 /**
  * Created by Arka Prava Basu <arkaprava94@gmail.com> on 23/5/18.
  */
-@Database(entities = [(Event::class), (EventTrigger::class)], version = 1)
+@Database(entities = [(Event::class), (EventTrigger::class)], version = 3)
 @TypeConverters(HavenEventDBConverters::class)
 abstract class HavenEventDB: RoomDatabase() {
 
@@ -32,9 +32,8 @@ abstract class HavenEventDB: RoomDatabase() {
                 synchronized(HavenEventDB::class) {
                     if (INSTANCE == null) {
                         INSTANCE = Room.databaseBuilder(context.applicationContext,
-                                HavenEventDB::class.java, "haven_database")
+                                HavenEventDB::class.java, "haven.db")
                                 .allowMainThreadQueries() // todo remove this
-                                .fallbackToDestructiveMigration()
                                 .build()
                     }
                 }

diff --git a/src/main/java/org/havenapp/main/model/Event.kt b/src/main/java/org/havenapp/main/model/Event.kt
@@ -1,5 +1,6 @@
 package org.havenapp.main.model
 
+import android.arch.persistence.room.ColumnInfo
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.Ignore
 import android.arch.persistence.room.PrimaryKey
@@ -9,14 +10,16 @@ import java.util.*
 /**
  * Created by Arka Prava Basu <arkaprava94@gmail.com> on 20/5/18.
  */
-@Entity(tableName = "event_table")
+@Entity(tableName = "EVENT")
 class Event {
 
     @PrimaryKey(autoGenerate = true)
-    var id : Long = 0
+    @ColumnInfo(name = "ID")
+    var id : Long? = null
         get() = field
 
-    var mStartTime : Date = Date()
+    @ColumnInfo(name = "M_START_TIME")
+    var mStartTime : Date? = Date()
 
     @Ignore
     private var mEventTriggers : MutableList<EventTrigger> = mutableListOf()

diff --git a/src/main/java/org/havenapp/main/model/EventTrigger.kt b/src/main/java/org/havenapp/main/model/EventTrigger.kt
@@ -1,5 +1,6 @@
 package org.havenapp.main.model
 
+import android.arch.persistence.room.ColumnInfo
 import android.arch.persistence.room.Entity
 import android.arch.persistence.room.PrimaryKey
 import android.content.Context
@@ -9,7 +10,7 @@ import java.util.*
 /**
  * Created by Arka Prava Basu <arkaprava94@gmail.com> on 22/5/18.
  */
-@Entity(tableName = "event_trigger_table")
+@Entity(tableName = "EVENT_TRIGGER")
 class EventTrigger {
     companion object {
         /**
@@ -59,16 +60,21 @@ class EventTrigger {
     }
 
     @PrimaryKey(autoGenerate = true)
-    var id : Long = 0
+    @ColumnInfo(name = "ID")
+    var id : Long? = null
         get() = field
 
-    var mType: Int = 0
+    @ColumnInfo(name = "M_TYPE")
+    var mType: Int? = 0
 
     // Trigger time
-    var mTime: Date = Date()
+    @ColumnInfo(name  = "M_TIME")
+    var mTime: Date? = Date()
 
-    var mEventId: Long = 0
+    @ColumnInfo(name = "M_EVENT_ID")
+    var mEventId: Long? = 0
 
+    @ColumnInfo(name = "M_PATH")
     var mPath: String? = null
 
     fun getStringType(context: Context): String {