Merge pull request #15015 from nextcloud/backport/15010/stable-3.32

[stable-3.32] BugFix - Add Manual Migration 88 to 89

Author: tobiasKaminsky

app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt

@@ -29,6 +29,7 @@ import com.nextcloud.client.database.entity.SyncedFolderEntity
 import com.nextcloud.client.database.entity.UploadEntity
 import com.nextcloud.client.database.entity.VirtualEntity
 import com.nextcloud.client.database.migrations.DatabaseMigrationUtil
+import com.nextcloud.client.database.migrations.MIGRATION_88_89
 import com.nextcloud.client.database.migrations.Migration67to68
 import com.nextcloud.client.database.migrations.RoomMigration
 import com.nextcloud.client.database.migrations.addLegacyMigrations
@@ -72,7 +73,7 @@ import com.owncloud.android.db.ProviderMeta
         AutoMigration(from = 85, to = 86, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
         AutoMigration(from = 86, to = 87, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
         AutoMigration(from = 87, to = 88, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
-        AutoMigration(from = 88, to = 89),
+        // manual migration used for 88 to 89
         AutoMigration(from = 89, to = 90)
     ],
     exportSchema = true
@@ -106,6 +107,7 @@ abstract class NextcloudDatabase : RoomDatabase() {
                     .addLegacyMigrations(clock, context)
                     .addMigrations(RoomMigration())
                     .addMigrations(Migration67to68())
+                    .addMigrations(MIGRATION_88_89)
                     .build()
             }
             return instance!!

app/src/main/java/com/nextcloud/client/database/migrations/DatabaseMigrationUtil.kt

@@ -10,6 +10,7 @@ package com.nextcloud.client.database.migrations
 import androidx.room.DeleteColumn
 import androidx.room.migration.AutoMigrationSpec
 import androidx.sqlite.db.SupportSQLiteDatabase
+import com.nextcloud.client.database.migrations.model.SQLiteColumnType
 
 object DatabaseMigrationUtil {
 
@@ -18,6 +19,32 @@ object DatabaseMigrationUtil {
     const val TYPE_INTEGER_PRIMARY_KEY = "INTEGER PRIMARY KEY"
     const val KEYWORD_NOT_NULL = "NOT NULL"
 
+    fun addColumnIfNotExists(
+        db: SupportSQLiteDatabase,
+        tableName: String,
+        columnName: String,
+        columnType: SQLiteColumnType
+    ) {
+        val cursor = db.query("PRAGMA table_info($tableName)")
+        var columnExists = false
+
+        while (cursor.moveToNext()) {
+            val nameIndex = cursor.getColumnIndex("name")
+            if (nameIndex != -1) {
+                val existingColumnName = cursor.getString(nameIndex)
+                if (existingColumnName == columnName) {
+                    columnExists = true
+                    break
+                }
+            }
+        }
+        cursor.close()
+
+        if (!columnExists) {
+            db.execSQL("ALTER TABLE $tableName ADD COLUMN `$columnName` ${columnType.value}")
+        }
+    }
+
     /**
      * Utility method to add or remove columns from a table
      *

app/src/main/java/com/nextcloud/client/database/migrations/Migration88to89.kt

@@ -0,0 +1,30 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Alper Ozturk <[email protected]>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nextcloud.client.database.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import com.nextcloud.client.database.migrations.model.SQLiteColumnType
+import com.owncloud.android.db.ProviderMeta.ProviderTableMeta
+
+val MIGRATION_88_89 = object : Migration(88, 89) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        DatabaseMigrationUtil.addColumnIfNotExists(
+            database,
+            ProviderTableMeta.FILE_TABLE_NAME,
+            ProviderTableMeta.FILE_UPLOADED,
+            SQLiteColumnType.INTEGER_DEFAULT_NULL
+        )
+        DatabaseMigrationUtil.addColumnIfNotExists(
+            database,
+            ProviderTableMeta.CAPABILITIES_TABLE_NAME,
+            ProviderTableMeta.CAPABILITIES_NOTES_FOLDER_PATH,
+            SQLiteColumnType.TEXT_DEFAULT_NULL
+        )
+    }
+}

app/src/main/java/com/nextcloud/client/database/migrations/model/SQLiteColumnType.kt

@@ -0,0 +1,13 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Alper Ozturk <[email protected]>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nextcloud.client.database.migrations.model
+
+enum class SQLiteColumnType(val value: String) {
+    INTEGER_DEFAULT_NULL("INTEGER DEFAULT NULL"),
+    TEXT_DEFAULT_NULL("TEXT DEFAULT NULL")
+}