Merge pull request #373 from jogrimst/master

#327 Do not increase greenDAO schemaVersion if no database changes have been made
elimu-ai · Feb 26, 2017 · 8d91881 · 8d91881
2 parents 73614a2 + be14a79
commit 8d91881
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 148 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.literacyapp"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 1005004 // Must match contentprovider.greendao.schemaVersion in contentprovider/build.gradle
-        versionName "1.5.4"
+        versionCode 1005005
+        versionName "1.5.5"
 
 //        jackOptions {
 //            enabled true
@@ -55,7 +55,7 @@ android {
 }
 
 greendao {
-    schemaVersion android.defaultConfig.versionCode
+    schemaVersion 2000000 // Must match greendao.schemaVersion in contentprovider/build.gradle
     daoPackage 'org.literacyapp.contentprovider.dao'
     targetGenDir '../contentprovider/src/main/java'
 }

diff --git a/app/src/main/java/org/literacyapp/LiteracyApplication.java b/app/src/main/java/org/literacyapp/LiteracyApplication.java
@@ -8,7 +8,7 @@
 import android.speech.tts.TextToSpeech;
 import android.util.Log;
 
-import org.literacyapp.contentprovider.dao.CustomDaoMaster;
+import org.literacyapp.dao.CustomDaoMaster;
 import org.literacyapp.contentprovider.dao.DaoSession;
 import org.literacyapp.util.VersionHelper;
 

diff --git a/app/src/main/java/org/literacyapp/dao/CustomDaoMaster.java b/app/src/main/java/org/literacyapp/dao/CustomDaoMaster.java
@@ -0,0 +1,46 @@
+package org.literacyapp.dao;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.util.Log;
+
+import org.greenrobot.greendao.database.Database;
+import org.literacyapp.contentprovider.dao.DaoMaster;
+
+public class CustomDaoMaster extends DaoMaster {
+
+    public CustomDaoMaster(SQLiteDatabase db) {
+        super(db);
+        Log.i(getClass().getName(), "CustomDaoMaster");
+    }
+
+    public static class DevOpenHelper extends OpenHelper {
+        public DevOpenHelper(Context context, String name) {
+            super(context, name);
+        }
+
+        public DevOpenHelper(Context context, String name, SQLiteDatabase.CursorFactory factory) {
+            super(context, name, factory);
+        }
+
+        @Override
+        public void onUpgrade(Database db, int oldVersion, int newVersion) {
+            Log.i(getClass().getName(), "Upgrading schema from version " + oldVersion + " to " + newVersion);
+
+            if (oldVersion < 2000000) {
+                dropAllTables(db, true);
+                onCreate(db);
+            }
+
+//            if (oldVersion < ???) {
+//                // Add new tables and/or columns automatically (include only the DAO classes that have been modified)
+//                DbMigrationHelper.migrate(db,
+//                        AudioDao.class
+//                );
+//            }
+
+            // If tables and/or columns have been renamed, add custom script.
+//            db.execSQL("...");
+        }
+    }
+}
diff --git a/...ontentprovider/dao/DbMigrationHelper.java → ...rg/literacyapp/dao/DbMigrationHelper.java b/...ontentprovider/dao/DbMigrationHelper.java → ...rg/literacyapp/dao/DbMigrationHelper.java
@@ -1,4 +1,4 @@
-package org.literacyapp.contentprovider.dao;
+package org.literacyapp.dao;
 
 import android.database.Cursor;
 import android.support.annotation.NonNull;

diff --git a/contentprovider/build.gradle b/contentprovider/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 1000000
-        versionName "1.0.0"
+        versionCode 1000001
+        versionName "1.0.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -27,7 +27,7 @@ android {
 }
 
 greendao {
-    schemaVersion 1005004 // Must match android.defaultConfig.versionCode in app/build.gradle
+    schemaVersion 2000000 // Must match greendao.schemaVersion in app/build.gradle
     daoPackage 'org.literacyapp.contentprovider.dao'
     targetGenDir '../contentprovider/src/main/java'
 }

diff --git a/contentprovider/src/main/java/org/literacyapp/contentprovider/dao/CustomDaoMaster.java b/contentprovider/src/main/java/org/literacyapp/contentprovider/dao/CustomDaoMaster.java
diff --git a/contentprovider/src/main/java/org/literacyapp/contentprovider/dao/DaoMaster.java b/contentprovider/src/main/java/org/literacyapp/contentprovider/dao/DaoMaster.java
@@ -14,10 +14,10 @@
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 /**
- * Master of DAO (schema version 1005004): knows all DAOs.
+ * Master of DAO (schema version 2000000): knows all DAOs.
  */
 public class DaoMaster extends AbstractDaoMaster {
-    public static final int SCHEMA_VERSION = 1005004;
+    public static final int SCHEMA_VERSION = 2000000;
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {