From 587b22f0d3699a3c54fcdc68c91681034bec6737 Mon Sep 17 00:00:00 2001
From: stefan-niedermann <info@niedermann.it>
Date: Wed, 22 Jan 2020 20:47:31 +0100
Subject: [PATCH] Fix #696 Database upgrade

---
 .../notes/persistence/NoteSQLiteOpenHelper.java  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java
index 38662247..cbe28fc3 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java
@@ -149,6 +149,7 @@ public class NoteSQLiteOpenHelper extends SQLiteOpenHelper {
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         if (oldVersion < 3) {
             recreateDatabase(db);
+            return;
         }
         if (oldVersion < 4) {
             db.delete(table_notes, null, null);
@@ -166,11 +167,22 @@ public class NoteSQLiteOpenHelper extends SQLiteOpenHelper {
             DatabaseIndexUtil.dropIndexes(db);
             db.execSQL("ALTER TABLE " + table_notes + " ADD COLUMN " + key_category + " TEXT NOT NULL DEFAULT ''");
             db.execSQL("ALTER TABLE " + table_notes + " ADD COLUMN " + key_etag + " TEXT");
-            createNotesIndexes(db);
+            DatabaseIndexUtil.createIndex(db, table_notes, key_remote_id, key_status, key_favorite, key_category, key_modified);
         }
         if (oldVersion < 8) {
             final String table_temp = "NOTES_TEMP";
-            createNotesTable(db, table_temp);
+            db.execSQL("CREATE TABLE " + table_temp + " ( " +
+                    key_id + " INTEGER PRIMARY KEY AUTOINCREMENT, " +
+                    key_remote_id + " INTEGER, " +
+                    key_account_id + " INTEGER, " +
+                    key_status + " VARCHAR(50), " +
+                    key_title + " TEXT, " +
+                    key_modified + " INTEGER DEFAULT 0, " +
+                    key_content + " TEXT, " +
+                    key_favorite + " INTEGER DEFAULT 0, " +
+                    key_category + " TEXT NOT NULL DEFAULT '', " +
+                    key_etag + " TEXT)");
+            createNotesIndexes(db);
             db.execSQL(String.format("INSERT INTO %s(%s,%s,%s,%s,%s,%s,%s,%s,%s) ", table_temp, key_id, key_remote_id, key_status, key_title, key_modified, key_content, key_favorite, key_category, key_etag)
                     + String.format("SELECT %s,%s,%s,%s,strftime('%%s',%s),%s,%s,%s,%s FROM %s", key_id, key_remote_id, key_status, key_title, key_modified, key_content, key_favorite, key_category, key_etag, table_notes));
             db.execSQL(String.format("DROP TABLE %s", table_notes));