Skip to content
Snippets Groups Projects
Verified Commit c0ff2a6b authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Attempt at fixing migration crashes

parent cd8fcb2a
No related branches found
No related tags found
No related merge requests found
Pipeline #
......@@ -29,6 +29,7 @@ import de.kuschku.malheur.CrashHandler
import de.kuschku.quasseldroid.dagger.DaggerAppComponent
import de.kuschku.quasseldroid.persistence.AccountDatabase
import de.kuschku.quasseldroid.persistence.LegacyAccountDatabase
import de.kuschku.quasseldroid.persistence.QuasselDatabase
import de.kuschku.quasseldroid.settings.AppearanceSettings
import de.kuschku.quasseldroid.settings.SettingsMigration
import de.kuschku.quasseldroid.settings.SettingsMigrationManager
......@@ -156,6 +157,10 @@ class Quasseldroid : DaggerApplication() {
)
).migrate(this)
// Initialize databases to run migrations
QuasselDatabase.Creator.init(this)
AccountDatabase.Creator.init(this)
// Initialize preferences unless already set
/*
......
......@@ -125,14 +125,10 @@ abstract class QuasselDatabase : RoomDatabase() {
@Query("UPDATE filtered SET filtered = :filtered WHERE accountId = :accountId AND bufferId = :bufferId")
fun setFiltered(accountId: Long, bufferId: Int, filtered: Int)
@Query(
"SELECT filtered FROM filtered WHERE bufferId = :bufferId AND accountId = :accountId UNION SELECT :default as filtered ORDER BY filtered DESC LIMIT 1"
)
@Query("SELECT filtered FROM filtered WHERE bufferId = :bufferId AND accountId = :accountId UNION SELECT :default as filtered ORDER BY filtered DESC LIMIT 1")
fun get(accountId: Long, bufferId: Int, default: Int): Int
@Query(
"SELECT filtered FROM filtered WHERE bufferId = :bufferId AND accountId = :accountId UNION SELECT :default as filtered ORDER BY filtered DESC LIMIT 1"
)
@Query("SELECT filtered FROM filtered WHERE bufferId = :bufferId AND accountId = :accountId UNION SELECT :default as filtered ORDER BY filtered DESC LIMIT 1")
fun listen(accountId: Long, bufferId: Int, default: Int): LiveData<Int>
@Query("SELECT * FROM filtered WHERE accountId = :accountId")
......@@ -327,9 +323,8 @@ abstract class QuasselDatabase : RoomDatabase() {
},
object : Migration(14, 15) {
override fun migrate(database: SupportSQLiteDatabase) {
database.execSQL(
"ALTER TABLE message ADD networkId INT DEFAULT 0 NOT NULL;"
)
database.execSQL("DELETE FROM message;")
database.execSQL("ALTER TABLE message ADD networkId INT DEFAULT 0 NOT NULL;")
}
}
).build()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment