Skip to content

Commit c65f48a

Browse files
Merge pull request #16443 from nextcloud/fix/migration-97-to-98
fix(db): migration 97 to 98
2 parents 891944b + 55a53c8 commit c65f48a

File tree

2 files changed

+38
-2
lines changed

2 files changed

+38
-2
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import com.nextcloud.client.database.entity.UploadEntity
3838
import com.nextcloud.client.database.entity.VirtualEntity
3939
import com.nextcloud.client.database.migrations.DatabaseMigrationUtil
4040
import com.nextcloud.client.database.migrations.MIGRATION_88_89
41+
import com.nextcloud.client.database.migrations.MIGRATION_97_98
4142
import com.nextcloud.client.database.migrations.Migration67to68
4243
import com.nextcloud.client.database.migrations.RoomMigration
4344
import com.nextcloud.client.database.migrations.addLegacyMigrations
@@ -92,8 +93,8 @@ import com.owncloud.android.db.ProviderMeta
9293
AutoMigration(from = 93, to = 94, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
9394
AutoMigration(from = 94, to = 95, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
9495
AutoMigration(from = 95, to = 96),
95-
AutoMigration(from = 96, to = 97, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
96-
AutoMigration(from = 97, to = 98)
96+
AutoMigration(from = 96, to = 97, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class)
97+
// manual migration used for 97 to 98
9798
],
9899
exportSchema = true
99100
)
@@ -131,6 +132,7 @@ abstract class NextcloudDatabase : RoomDatabase() {
131132
.addMigrations(RoomMigration())
132133
.addMigrations(Migration67to68())
133134
.addMigrations(MIGRATION_88_89)
135+
.addMigrations(MIGRATION_97_98)
134136
.build()
135137
}
136138
return instance!!
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*
2+
* Nextcloud - Android Client
3+
*
4+
* SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
5+
* SPDX-License-Identifier: AGPL-3.0-or-later
6+
*/
7+
8+
package com.nextcloud.client.database.migrations
9+
10+
import androidx.room.migration.Migration
11+
import androidx.sqlite.db.SupportSQLiteDatabase
12+
import com.nextcloud.client.database.migrations.model.SQLiteColumnType
13+
import com.owncloud.android.db.ProviderMeta
14+
15+
@Suppress("MagicNumber")
16+
val MIGRATION_97_98 = object : Migration(97, 98) {
17+
override fun migrate(db: SupportSQLiteDatabase) {
18+
DatabaseMigrationUtil.addColumnIfNotExists(
19+
db,
20+
ProviderMeta.ProviderTableMeta.UPLOADS_TABLE_NAME,
21+
ProviderMeta.ProviderTableMeta.UPLOADS_UPLOAD_END_TIMESTAMP_LONG,
22+
SQLiteColumnType.INTEGER_DEFAULT_NULL
23+
)
24+
25+
DatabaseMigrationUtil.addColumnIfNotExists(
26+
db,
27+
ProviderMeta.ProviderTableMeta.CAPABILITIES_TABLE_NAME,
28+
ProviderMeta.ProviderTableMeta.CAPABILITIES_CLIENT_INTEGRATION_JSON,
29+
SQLiteColumnType.TEXT_DEFAULT_NULL
30+
)
31+
32+
DatabaseMigrationUtil.resetCapabilities(db)
33+
}
34+
}

0 commit comments

Comments
 (0)