Skip to content

Commit c5c7e9f

Browse files
committed
no need migration, just drop not used column
Signed-off-by: alperozturk <alper_ozturk@proton.me>
1 parent 3463124 commit c5c7e9f

3 files changed

Lines changed: 10 additions & 50 deletions

File tree

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import com.nextcloud.client.database.entity.UploadEntity
3030
import com.nextcloud.client.database.entity.VirtualEntity
3131
import com.nextcloud.client.database.migrations.DatabaseMigrationUtil
3232
import com.nextcloud.client.database.migrations.Migration67to68
33-
import com.nextcloud.client.database.migrations.Migration84to85
3433
import com.nextcloud.client.database.migrations.RoomMigration
3534
import com.nextcloud.client.database.migrations.addLegacyMigrations
3635
import com.nextcloud.client.database.typeConverter.OfflineOperationTypeConverter
@@ -69,7 +68,7 @@ import com.owncloud.android.db.ProviderMeta
6968
AutoMigration(from = 81, to = 82),
7069
AutoMigration(from = 82, to = 83),
7170
AutoMigration(from = 83, to = 84),
72-
AutoMigration(from = 84, to = 85)
71+
AutoMigration(from = 84, to = 85, spec = DatabaseMigrationUtil.DeleteColumnSpec::class)
7372
],
7473
exportSchema = true
7574
)
@@ -102,7 +101,6 @@ abstract class NextcloudDatabase : RoomDatabase() {
102101
.addLegacyMigrations(clock, context)
103102
.addMigrations(RoomMigration())
104103
.addMigrations(Migration67to68())
105-
.addMigrations(Migration84to85)
106104
.fallbackToDestructiveMigration()
107105
.build()
108106
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*/
88
package com.nextcloud.client.database.migrations
99

10+
import androidx.room.DeleteColumn
1011
import androidx.room.migration.AutoMigrationSpec
1112
import androidx.sqlite.db.SupportSQLiteDatabase
1213

@@ -90,4 +91,12 @@ object DatabaseMigrationUtil {
9091
super.onPostMigrate(db)
9192
}
9293
}
94+
95+
@DeleteColumn.Entries(
96+
DeleteColumn(
97+
tableName = "offline_operations",
98+
columnName = "offline_operations_parent_path"
99+
)
100+
)
101+
class DeleteColumnSpec : AutoMigrationSpec
93102
}

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

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)