Merge pull request #34 from MarcDonald/fix/add-location-to-migration

Add location field to database version 13 to 14 migration
MarcDonald · Dec 17, 2019 · f7253a4 · f7253a4
2 parents 73b2a92 + 72c3a7e
commit f7253a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -31,8 +31,8 @@ android {
         minSdkVersion 23
         //noinspection OldTargetApi
         targetSdkVersion 28
-        versionCode 32
-        versionName "1.3.0"
+        versionCode 33
+        versionName "1.3.1"
         setProperty("archivesBaseName", "Hibi-v$versionName")
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/com/marcdonald/hibi/data/database/ProductionAppDatabase.kt b/app/src/main/java/com/marcdonald/hibi/data/database/ProductionAppDatabase.kt
@@ -207,8 +207,8 @@ abstract class ProductionAppDatabase : RoomDatabase(), AppDatabase {
 												 "content TEXT NOT NULL," +
 												 "location TEXT NOT NULL DEFAULT ''," +
 												 "isFavourite INTEGER NOT NULL DEFAULT 0)")
-				database.execSQL("INSERT INTO Entry(id, day, month, year, hour, minute, content) " +
-												 "SELECT id, day, month, year, hour, minute, content FROM EntryOLD")
+				database.execSQL("INSERT INTO Entry(id, day, month, year, hour, minute, content, location) " +
+												 "SELECT id, day, month, year, hour, minute, content, location FROM EntryOLD")
 				database.execSQL("DROP TABLE EntryOLD")
 			}
 		}