mirror of
https://github.com/home-assistant/android
synced 2024-09-19 16:11:37 +00:00
Only do the migration if we have rows to migrate (#949)
This commit is contained in:
parent
e652696f1d
commit
e874977320
|
@ -139,18 +139,20 @@ abstract class AppDatabase : RoomDatabase() {
|
||||||
override fun migrate(database: SupportSQLiteDatabase) {
|
override fun migrate(database: SupportSQLiteDatabase) {
|
||||||
val cursor = database.query("SELECT * FROM sensors")
|
val cursor = database.query("SELECT * FROM sensors")
|
||||||
val sensors = mutableListOf<ContentValues>()
|
val sensors = mutableListOf<ContentValues>()
|
||||||
while (cursor.moveToNext()) {
|
if (cursor.count > 0) {
|
||||||
sensors.add(ContentValues().also {
|
while (cursor.moveToNext()) {
|
||||||
it.put("id", cursor.getString(cursor.getColumnIndex("unique_id")))
|
sensors.add(ContentValues().also {
|
||||||
it.put("enabled", cursor.getInt(cursor.getColumnIndex("enabled")))
|
it.put("id", cursor.getString(cursor.getColumnIndex("unique_id")))
|
||||||
it.put("registered", cursor.getInt(cursor.getColumnIndex("registered")))
|
it.put("enabled", cursor.getInt(cursor.getColumnIndex("enabled")))
|
||||||
it.put("state", "")
|
it.put("registered", cursor.getInt(cursor.getColumnIndex("registered")))
|
||||||
it.put("state_type", "")
|
it.put("state", "")
|
||||||
it.put("type", "")
|
it.put("state_type", "")
|
||||||
it.put("icon", "")
|
it.put("type", "")
|
||||||
it.put("name", "")
|
it.put("icon", "")
|
||||||
it.put("device_class", "")
|
it.put("name", "")
|
||||||
})
|
it.put("device_class", "")
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
cursor.close()
|
cursor.close()
|
||||||
database.execSQL("DROP TABLE IF EXISTS `sensors`")
|
database.execSQL("DROP TABLE IF EXISTS `sensors`")
|
||||||
|
@ -176,18 +178,20 @@ abstract class AppDatabase : RoomDatabase() {
|
||||||
override fun migrate(database: SupportSQLiteDatabase) {
|
override fun migrate(database: SupportSQLiteDatabase) {
|
||||||
val cursor = database.query("SELECT * FROM sensors")
|
val cursor = database.query("SELECT * FROM sensors")
|
||||||
val sensors = mutableListOf<ContentValues>()
|
val sensors = mutableListOf<ContentValues>()
|
||||||
while (cursor.moveToNext()) {
|
if (cursor.count > 0) {
|
||||||
sensors.add(ContentValues().also {
|
while (cursor.moveToNext()) {
|
||||||
it.put("id", cursor.getString(cursor.getColumnIndex("id")))
|
sensors.add(ContentValues().also {
|
||||||
it.put("enabled", cursor.getInt(cursor.getColumnIndex("enabled")))
|
it.put("id", cursor.getString(cursor.getColumnIndex("id")))
|
||||||
it.put("registered", cursor.getInt(cursor.getColumnIndex("registered")))
|
it.put("enabled", cursor.getInt(cursor.getColumnIndex("enabled")))
|
||||||
it.put("state", "")
|
it.put("registered", cursor.getInt(cursor.getColumnIndex("registered")))
|
||||||
it.put("last_sent_state", "")
|
it.put("state", "")
|
||||||
it.put("state_type", "")
|
it.put("last_sent_state", "")
|
||||||
it.put("type", "")
|
it.put("state_type", "")
|
||||||
it.put("icon", "")
|
it.put("type", "")
|
||||||
it.put("name", "")
|
it.put("icon", "")
|
||||||
})
|
it.put("name", "")
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
cursor.close()
|
cursor.close()
|
||||||
database.execSQL("DROP TABLE IF EXISTS `sensors`")
|
database.execSQL("DROP TABLE IF EXISTS `sensors`")
|
||||||
|
|
Loading…
Reference in a new issue