Merge pull request #65 from SUPLA/develop

Improved database update procedure
SUPLA · May 11, 2019 · ec83ba9 · ec83ba9
2 parents 53c5339 + 38b531b
commit ec83ba9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -87,7 +87,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.supla.android"
         minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
-        versionCode 51
-        versionName "2.3.0"
+        versionCode 52
+        versionName "2.3.1"
 
         sourceSets.main {
             jniLibs.srcDir 'src/main/libs'

diff --git a/app/src/main/java/org/supla/android/db/DbHelper.java b/app/src/main/java/org/supla/android/db/DbHelper.java
@@ -593,11 +593,8 @@ private void upgradeToV4(SQLiteDatabase db) {
         createLocationTable(db);
         createChannelTable(db);
         createChannelValueTable(db);
-        createChannelView(db);
         createChannelGroupTable(db);
         createChannelGroupRelationTable(db);
-        createChannelGroupValueView(db);
-
     }
 
     private void upgradeToV5(SQLiteDatabase db) {
@@ -609,7 +606,6 @@ private void upgradeToV6(SQLiteDatabase db) {
         Trace.d(DbHelper.class.getName(), "upgradeToV6");
 
         createElectricityMeterLogTable(db);
-        createElectricityMeterLogView(db);
 
         execSQL(db, "ALTER TABLE " + SuplaContract.ChannelEntry.TABLE_NAME
                 + " ADD COLUMN " + SuplaContract.ChannelEntry.COLUMN_NAME_DEVICEID
@@ -639,8 +635,6 @@ private void upgradeToV6(SQLiteDatabase db) {
                 + " ADD COLUMN " + SuplaContract.LocationEntry.COLUMN_NAME_COLLAPSED
                 + " INTEGER NOT NULL default 0");
 
-        execSQL(db, "DROP VIEW " + SuplaContract.ChannelViewEntry.VIEW_NAME);
-        createChannelView(db);
     }
 
     private void upgradeToV7(SQLiteDatabase db) {
@@ -651,21 +645,15 @@ private void upgradeToV7(SQLiteDatabase db) {
     private void upgradeToV8(SQLiteDatabase db) {
         Trace.d(DbHelper.class.getName(), "upgradeToV8");
         createUserIconsTable(db);
-        execSQL(db, "DROP VIEW " + SuplaContract.ChannelViewEntry.VIEW_NAME);
-        createChannelView(db);
     }
 
     private void upgradeToV9(SQLiteDatabase db) {
         Trace.d(DbHelper.class.getName(), "upgradeToV9");
         execSQL(db, "DROP TABLE " + SuplaContract.ChannelValueEntry.TABLE_NAME);
         execSQL(db, "DROP TABLE " + SuplaContract.ChannelExtendedValueEntry.TABLE_NAME);
-        execSQL(db, "DROP VIEW " + SuplaContract.ChannelViewEntry.VIEW_NAME);
-        execSQL(db, "DROP VIEW " + SuplaContract.ChannelGroupValueViewEntry.VIEW_NAME);
-
         createChannelValueTable(db);
         createChannelExtendedValueTable(db);
-        createChannelView(db);
-        createChannelGroupValueView(db);
+
 
         createImpulseCounterLogTable(db);
         createTemperatureLogTable(db);
@@ -676,19 +664,32 @@ private void upgradeToV10(SQLiteDatabase db) {
         Trace.d(DbHelper.class.getName(), "upgradeToV10");
         execSQL(db, "DROP TABLE " + SuplaContract.ImpulseCounterLogEntry.TABLE_NAME);
         createImpulseCounterLogTable(db);
-        createImpulseCounterLogView(db);
     }
 
     private void upgradeToV11(SQLiteDatabase db) {
         Trace.d(DbHelper.class.getName(), "upgradeToV11");
-        execSQL(db, "DROP VIEW " + SuplaContract.ImpulseCounterLogViewEntry.VIEW_NAME);
-        execSQL(db, "DROP VIEW " + SuplaContract.ElectricityMeterLogViewEntry.VIEW_NAME);
+
         execSQL(db, "DROP TABLE " + SuplaContract.ElectricityMeterLogEntry.TABLE_NAME);
         execSQL(db, "DROP TABLE " + SuplaContract.ImpulseCounterLogEntry.TABLE_NAME);
 
         createElectricityMeterLogTable(db);
         createImpulseCounterLogTable(db);
 
+
+    }
+
+    private void recreateViews(SQLiteDatabase db) {
+        execSQL(db, "DROP VIEW IF EXISTS "
+                + SuplaContract.ChannelViewEntry.VIEW_NAME);
+        execSQL(db, "DROP VIEW IF EXISTS "
+                + SuplaContract.ChannelGroupValueViewEntry.VIEW_NAME);
+        execSQL(db, "DROP VIEW IF EXISTS "
+                + SuplaContract.ImpulseCounterLogViewEntry.VIEW_NAME);
+        execSQL(db, "DROP VIEW IF EXISTS "
+                + SuplaContract.ElectricityMeterLogViewEntry.VIEW_NAME);
+
+        createChannelView(db);
+        createChannelGroupValueView(db);
         createElectricityMeterLogView(db);
         createImpulseCounterLogView(db);
     }
@@ -740,6 +741,9 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
                         break;
                 }
             }
+
+            // Recreate views on the end
+            recreateViews(db);
         }
 
     }