diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt index 1cc760f7..cacecd14 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt @@ -124,7 +124,7 @@ class ActiveServerProvider( UApp.applicationContext(), MetaDatabase::class.java, METADATA_DB + serverId - ).fallbackToDestructiveMigration() + ).fallbackToDestructiveMigrationOnDowngrade() .build() } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/MetaDatabase.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/MetaDatabase.kt index dc377118..c50629fb 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/MetaDatabase.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/MetaDatabase.kt @@ -1,11 +1,10 @@ package org.moire.ultrasonic.data +import androidx.room.AutoMigration import androidx.room.Database import androidx.room.RoomDatabase import androidx.room.TypeConverter import androidx.room.TypeConverters -import androidx.room.migration.Migration -import androidx.sqlite.db.SupportSQLiteDatabase import java.util.Date import org.moire.ultrasonic.domain.Album import org.moire.ultrasonic.domain.Artist @@ -25,8 +24,14 @@ import org.moire.ultrasonic.domain.Track Index::class, MusicFolder::class ], - version = 2, - exportSchema = true + autoMigrations = [ + AutoMigration( + from = 1, + to = 2 + ), + ], + exportSchema = true, + version = 2 ) @TypeConverters(Converters::class) abstract class MetaDatabase : RoomDatabase() { @@ -34,7 +39,7 @@ abstract class MetaDatabase : RoomDatabase() { abstract fun albumDao(): AlbumDao - abstract fun trackDao(): AlbumDao + abstract fun trackDao(): TrackDao abstract fun musicFoldersDao(): MusicFoldersDao @@ -52,11 +57,3 @@ class Converters { return date?.time } } - -val META_MIGRATION_2_1: Migration = object : Migration(2, 1) { - override fun migrate(database: SupportSQLiteDatabase) { - database.execSQL( - "DROP TABLE ServerSetting" - ) - } -}