move migration test to versions

yigit · yigit · commit ff2bd73bce43 · 2017-10-08T18:55:26.000-07:00
I also had to update some migration scripts since new version of room
enforces nullability
diff --git a/PersistenceMigrationsSample/app/build.gradle b/PersistenceMigrationsSample/app/build.gradle
@@ -17,13 +17,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion build_versions.target_sdk
+    buildToolsVersion build_versions.build_tools
 
     defaultConfig {
         applicationId "com.example.android.persistence.migration"
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
+        minSdkVersion build_versions.min_sdk
+        targetSdkVersion build_versions.targetSdkVersion
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -85,37 +85,37 @@ android {
 
 dependencies {
     //Support libraries
-    implementation "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
-    implementation "com.android.support:support-v4:$rootProject.supportLibraryVersion"
-    implementation "com.android.support:design:$rootProject.supportLibraryVersion"
-    implementation "android.arch.persistence.room:runtime:$rootProject.roomVersion"
-    annotationProcessor "android.arch.persistence.room:compiler:$rootProject.roomVersion"
+    implementation deps.support.app_compat
+    implementation deps.support.v4
+    implementation deps.support.design
+    implementation deps.room.runtime
+    annotationProcessor deps.room.compiler
 
     // Dependencies for local unit tests
-    testImplementation "junit:junit:$rootProject.ext.junitVersion"
-    testImplementation "org.mockito:mockito-all:$rootProject.ext.mockitoVersion"
-    testImplementation "org.hamcrest:hamcrest-all:$rootProject.ext.hamcrestVersion"
+    testImplementation deps.junit
+    testImplementation deps.mockito.all
+    testImplementation deps.hamcrest
 
     // Android Testing Support Library's runner and rules
-    androidTestImplementation "com.android.support.test:runner:$rootProject.ext.runnerVersion"
-    androidTestImplementation "com.android.support.test:rules:$rootProject.ext.rulesVersion"
-    androidTestImplementation "android.arch.persistence.room:testing:$rootProject.roomVersion"
+    androidTestCompile deps.atsl.runner
+    androidTestCompile deps.atsl.rules
+    androidTestCompile deps.room.testing
+    androidTestCompile deps.arch_core.testing
 
     // Dependencies for Android unit tests
-    androidTestImplementation "junit:junit:$rootProject.ext.junitVersion"
-    androidTestImplementation "org.mockito:mockito-core:$rootProject.ext.mockitoVersion"
-    androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
-    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
+    androidTestCompile deps.junit
+    androidTestCompile deps.mockito.core, { exclude group: 'net.bytebuddy' }
+    androidTestCompile deps.dexmaker
 
     // Espresso UI Testing
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.espressoVersion"
-    androidTestImplementation "com.android.support.test.espresso:espresso-contrib:$rootProject.espressoVersion"
-    androidTestImplementation "com.android.support.test.espresso:espresso-intents:$rootProject.espressoVersion"
+    androidTestCompile deps.espresso.core
+    androidTestCompile deps.espresso.contrib
+    androidTestCompile deps.espresso.intents
 
     // Resolve conflicts between main and test APK:
-    androidTestImplementation "com.android.support:support-annotations:$rootProject.supportLibraryVersion"
-    androidTestImplementation "com.android.support:support-v4:$rootProject.supportLibraryVersion"
-    androidTestImplementation "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
-    androidTestImplementation "com.android.support:design:$rootProject.supportLibraryVersion"
-
+    // Resolve conflicts between main and test APK:
+    androidTestCompile deps.support.annotations
+    androidTestCompile deps.support.v4
+    androidTestCompile deps.support.app_compat
+    androidTestCompile deps.support.design
 }
diff --git a/PersistenceMigrationsSample/app/schemas/com.example.android.persistence.migrations.UsersDatabase/2.json b/PersistenceMigrationsSample/app/schemas/com.example.android.persistence.migrations.UsersDatabase/2.json
@@ -2,21 +2,23 @@
   "formatVersion": 1,
   "database": {
     "version": 2,
-    "identityHash": "a146667337bb1ac18bbca63bc5d59421",
+    "identityHash": "99c7946712f93a4d723efbe10a500eb0",
     "entities": [
       {
         "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userid` INTEGER, `username` TEXT, PRIMARY KEY(`userid`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userid` INTEGER NOT NULL, `username` TEXT, PRIMARY KEY(`userid`))",
         "fields": [
           {
             "fieldPath": "mId",
             "columnName": "userid",
-            "affinity": "INTEGER"
+            "affinity": "INTEGER",
+            "notNull": true
           },
           {
             "fieldPath": "mUserName",
             "columnName": "username",
-            "affinity": "TEXT"
+            "affinity": "TEXT",
+            "notNull": false
           }
         ],
         "primaryKey": {
@@ -31,7 +33,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"a146667337bb1ac18bbca63bc5d59421\")"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"99c7946712f93a4d723efbe10a500eb0\")"
     ]
   }
 }
diff --git a/PersistenceMigrationsSample/app/schemas/com.example.android.persistence.migrations.UsersDatabase/3.json b/PersistenceMigrationsSample/app/schemas/com.example.android.persistence.migrations.UsersDatabase/3.json
@@ -2,26 +2,29 @@
   "formatVersion": 1,
   "database": {
     "version": 3,
-    "identityHash": "9ce74730f03594d59d1780980ad39b73",
+    "identityHash": "30a079c09b902b7e6d50fb4eca6380b0",
     "entities": [
       {
         "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userid` INTEGER, `username` TEXT, `last_update` INTEGER, PRIMARY KEY(`userid`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userid` INTEGER NOT NULL, `username` TEXT, `last_update` INTEGER, PRIMARY KEY(`userid`))",
         "fields": [
           {
             "fieldPath": "mId",
             "columnName": "userid",
-            "affinity": "INTEGER"
+            "affinity": "INTEGER",
+            "notNull": true
           },
           {
             "fieldPath": "mUserName",
             "columnName": "username",
-            "affinity": "TEXT"
+            "affinity": "TEXT",
+            "notNull": false
           },
           {
             "fieldPath": "mDate",
             "columnName": "last_update",
-            "affinity": "INTEGER"
+            "affinity": "INTEGER",
+            "notNull": false
           }
         ],
         "primaryKey": {
@@ -36,7 +39,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"9ce74730f03594d59d1780980ad39b73\")"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"30a079c09b902b7e6d50fb4eca6380b0\")"
     ]
   }
 }
diff --git a/PersistenceMigrationsSample/app/schemas/com.example.android.persistence.migrations.UsersDatabase/4.json b/PersistenceMigrationsSample/app/schemas/com.example.android.persistence.migrations.UsersDatabase/4.json
@@ -2,26 +2,29 @@
   "formatVersion": 1,
   "database": {
     "version": 4,
-    "identityHash": "12ffd58553365c5cebce6e857e5041eb",
+    "identityHash": "243f98c56672d3dcf342b1c0e8371721",
     "entities": [
       {
         "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userid` TEXT, `username` TEXT, `last_update` INTEGER, PRIMARY KEY(`userid`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userid` TEXT NOT NULL, `username` TEXT, `last_update` INTEGER, PRIMARY KEY(`userid`))",
         "fields": [
           {
             "fieldPath": "mId",
             "columnName": "userid",
-            "affinity": "TEXT"
+            "affinity": "TEXT",
+            "notNull": true
           },
           {
             "fieldPath": "mUserName",
             "columnName": "username",
-            "affinity": "TEXT"
+            "affinity": "TEXT",
+            "notNull": false
           },
           {
             "fieldPath": "mDate",
             "columnName": "last_update",
-            "affinity": "INTEGER"
+            "affinity": "INTEGER",
+            "notNull": false
           }
         ],
         "primaryKey": {
@@ -36,7 +39,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"12ffd58553365c5cebce6e857e5041eb\")"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"243f98c56672d3dcf342b1c0e8371721\")"
     ]
   }
 }
diff --git a/PersistenceMigrationsSample/app/src/androidTestRoom_Common/java/com/example/android/persistence/migrations/SqliteDatabaseTestHelper.java b/PersistenceMigrationsSample/app/src/androidTestRoom_Common/java/com/example/android/persistence/migrations/SqliteDatabaseTestHelper.java
@@ -23,7 +23,8 @@ public static void insertUser(int userid, String userName, SqliteTestDbOpenHelpe
     public static void createTable(SqliteTestDbOpenHelper helper) {
         SQLiteDatabase db = helper.getWritableDatabase();
 
-        db.execSQL("CREATE TABLE IF NOT EXISTS users (userid INTEGER PRIMARY KEY, username TEXT )");
+        db.execSQL("CREATE TABLE IF NOT EXISTS users (userid INTEGER PRIMARY KEY NOT NULL,"
+                + " username TEXT )");
 
         db.close();
     }
diff --git a/PersistenceMigrationsSample/app/src/room2/java/com/example/android/persistence/migrations/UsersDatabase.java b/PersistenceMigrationsSample/app/src/room2/java/com/example/android/persistence/migrations/UsersDatabase.java
@@ -67,8 +67,15 @@ public void migrate(SupportSQLiteDatabase database) {
     static final Migration MIGRATION_2_3 = new Migration(2, 3) {
         @Override
         public void migrate(SupportSQLiteDatabase database) {
-            database.execSQL("ALTER TABLE Users "
-                    + " ADD COLUMN last_update INTEGER");
+            database.execSQL("CREATE TABLE IF NOT EXISTS Users_new ("
+                    + "`userid` INTEGER NOT NULL,"
+                    + "`username` TEXT,"
+                    + "`last_update` INTEGER,"
+                    + "PRIMARY KEY(`userid`))");
+            database.execSQL("INSERT INTO Users_new "
+                    + " SELECT userid, username, null FROM Users");
+            database.execSQL("DROP TABLE Users");
+            database.execSQL("ALTER TABLE Users_new RENAME TO users");
         }
     };
 
diff --git a/PersistenceMigrationsSample/app/src/room3/java/com/example/android/persistence/migrations/User.java b/PersistenceMigrationsSample/app/src/room3/java/com/example/android/persistence/migrations/User.java
@@ -20,9 +20,9 @@
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.Ignore;
 import android.arch.persistence.room.PrimaryKey;
+import android.support.annotation.NonNull;
 
 import java.util.Date;
-import java.util.Random;
 import java.util.UUID;
 
 /**
@@ -33,6 +33,7 @@ public class User {
 
     @PrimaryKey
     @ColumnInfo(name = "userid")
+    @NonNull
     private String mId;
 
     @ColumnInfo(name = "username")
diff --git a/PersistenceMigrationsSample/app/src/room3/java/com/example/android/persistence/migrations/UsersDatabase.java b/PersistenceMigrationsSample/app/src/room3/java/com/example/android/persistence/migrations/UsersDatabase.java
@@ -67,8 +67,15 @@ public void migrate(SupportSQLiteDatabase database) {
     static final Migration MIGRATION_2_3 = new Migration(2, 3) {
         @Override
         public void migrate(SupportSQLiteDatabase database) {
-            database.execSQL("ALTER TABLE users "
-                    + " ADD COLUMN last_update INTEGER");
+            database.execSQL("CREATE TABLE IF NOT EXISTS Users_new ("
+                    + "`userid` INTEGER NOT NULL,"
+                    + "`username` TEXT,"
+                    + "`last_update` INTEGER,"
+                    + "PRIMARY KEY(`userid`))");
+            database.execSQL("INSERT INTO Users_new "
+                    + " SELECT userid, username, null FROM Users");
+            database.execSQL("DROP TABLE Users");
+            database.execSQL("ALTER TABLE Users_new RENAME TO users");
         }
     };
 
@@ -87,8 +94,10 @@ public void migrate(SupportSQLiteDatabase database) {
             // to do:
             // Create the new table
             database.execSQL(
-                    "CREATE TABLE users_new (userid TEXT, username TEXT, last_update INTEGER,"
-                            + " PRIMARY KEY(userid))");
+                    "CREATE TABLE users_new (userid TEXT NOT NULL,"
+                            + "username TEXT,"
+                            + "last_update INTEGER,"
+                            + "PRIMARY KEY(userid))");
             // Copy the data
             database.execSQL("INSERT INTO users_new (userid, username, last_update) "
                     + "SELECT userid, username, last_update "
diff --git a/PersistenceMigrationsSample/build.gradle b/PersistenceMigrationsSample/build.gradle
@@ -1,47 +1,18 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    apply from: '../versions.gradle'
+    addRepos(repositories)
 
-    repositories {
-        google()
-        jcenter()
-    }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta4'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath deps.android_gradle_plugin
     }
 }
 
 allprojects {
-    repositories {
-        google()
-        jcenter()
-    }
+    addRepos(repositories)
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
-
-// Define versions in a single place
-ext {
-    // Sdk and tools
-    minSdkVersion = 14
-    targetSdkVersion = 26
-    compileSdkVersion = 26
-    buildToolsVersion = '26.0.1'
-
-    // App dependencies
-    supportLibraryVersion = '26.0.2'
-    guavaVersion = '18.0'
-    junitVersion = '4.12'
-    mockitoVersion = '1.10.19'
-    powerMockito = '1.6.2'
-    hamcrestVersion = '1.3'
-    runnerVersion = '1.0.1'
-    rulesVersion = '1.0.1'
-    espressoVersion = '3.0.1'
-    roomVersion = '1.0.0-alpha9'
-}

Original file line number	Diff line number	Diff line change
`@@ -2,21 +2,23 @@`
`2`	`2`	`"formatVersion": 1,`
`3`	`3`	`"database": {`
`4`	`4`	`"version": 2,`
`5`		`- "identityHash": "a146667337bb1ac18bbca63bc5d59421",`
	`5`	`+ "identityHash": "99c7946712f93a4d723efbe10a500eb0",`
`6`	`6`	`"entities": [`
`7`	`7`	`{`
`8`	`8`	`"tableName": "users",`
`9`		- "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userid` INTEGER, `username` TEXT, PRIMARY KEY(`userid`))",
	`9`	+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userid` INTEGER NOT NULL, `username` TEXT, PRIMARY KEY(`userid`))",
`10`	`10`	`"fields": [`
`11`	`11`	`{`
`12`	`12`	`"fieldPath": "mId",`
`13`	`13`	`"columnName": "userid",`
`14`		`- "affinity": "INTEGER"`
	`14`	`+ "affinity": "INTEGER",`
	`15`	`+ "notNull": true`
`15`	`16`	`},`
`16`	`17`	`{`
`17`	`18`	`"fieldPath": "mUserName",`
`18`	`19`	`"columnName": "username",`
`19`		`- "affinity": "TEXT"`
	`20`	`+ "affinity": "TEXT",`
	`21`	`+ "notNull": false`
`20`	`22`	`}`
`21`	`23`	`],`
`22`	`24`	`"primaryKey": {`
`@@ -31,7 +33,7 @@`
`31`	`33`	`],`
`32`	`34`	`"setupQueries": [`
`33`	`35`	`"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",`
`34`		`- "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"a146667337bb1ac18bbca63bc5d59421\")"`
	`36`	`+ "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"99c7946712f93a4d723efbe10a500eb0\")"`
`35`	`37`	`]`
`36`	`38`	`}`
`37`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,26 +2,29 @@`
`2`	`2`	`"formatVersion": 1,`
`3`	`3`	`"database": {`
`4`	`4`	`"version": 3,`
`5`		`- "identityHash": "9ce74730f03594d59d1780980ad39b73",`
	`5`	`+ "identityHash": "30a079c09b902b7e6d50fb4eca6380b0",`
`6`	`6`	`"entities": [`
`7`	`7`	`{`
`8`	`8`	`"tableName": "users",`
`9`		- "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userid` INTEGER, `username` TEXT, `last_update` INTEGER, PRIMARY KEY(`userid`))",
	`9`	+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userid` INTEGER NOT NULL, `username` TEXT, `last_update` INTEGER, PRIMARY KEY(`userid`))",
`10`	`10`	`"fields": [`
`11`	`11`	`{`
`12`	`12`	`"fieldPath": "mId",`
`13`	`13`	`"columnName": "userid",`
`14`		`- "affinity": "INTEGER"`
	`14`	`+ "affinity": "INTEGER",`
	`15`	`+ "notNull": true`
`15`	`16`	`},`
`16`	`17`	`{`
`17`	`18`	`"fieldPath": "mUserName",`
`18`	`19`	`"columnName": "username",`
`19`		`- "affinity": "TEXT"`
	`20`	`+ "affinity": "TEXT",`
	`21`	`+ "notNull": false`
`20`	`22`	`},`
`21`	`23`	`{`
`22`	`24`	`"fieldPath": "mDate",`
`23`	`25`	`"columnName": "last_update",`
`24`		`- "affinity": "INTEGER"`
	`26`	`+ "affinity": "INTEGER",`
	`27`	`+ "notNull": false`
`25`	`28`	`}`
`26`	`29`	`],`
`27`	`30`	`"primaryKey": {`
`@@ -36,7 +39,7 @@`
`36`	`39`	`],`
`37`	`40`	`"setupQueries": [`
`38`	`41`	`"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",`
`39`		`- "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"9ce74730f03594d59d1780980ad39b73\")"`
	`42`	`+ "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"30a079c09b902b7e6d50fb4eca6380b0\")"`
`40`	`43`	`]`
`41`	`44`	`}`
`42`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ public static void insertUser(int userid, String userName, SqliteTestDbOpenHelpe`
`23`	`23`	`public static void createTable(SqliteTestDbOpenHelper helper) {`
`24`	`24`	`SQLiteDatabase db = helper.getWritableDatabase();`
`25`	`25`
`26`		`- db.execSQL("CREATE TABLE IF NOT EXISTS users (userid INTEGER PRIMARY KEY, username TEXT )");`
	`26`	`+ db.execSQL("CREATE TABLE IF NOT EXISTS users (userid INTEGER PRIMARY KEY NOT NULL,"`
	`27`	`+ + " username TEXT )");`
`27`	`28`
`28`	`29`	`db.close();`
`29`	`30`	`}`