caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev

Browse source
This commit is contained in:
Milos Kozak 2021-02-13 22:14:12 +01:00
commit 83a8d90cf3
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
database/src/main/java/info/nightscout/androidaps/database/AppDatabase.kt
View file

@ -6,14 +6,13 @@ import androidx.room.TypeConverters
import info.nightscout.androidaps.database.daos.* import info.nightscout.androidaps.database.daos.*
import info.nightscout.androidaps.database.entities.* import info.nightscout.androidaps.database.entities.*
const val DATABASE_VERSION = 2 const val DATABASE_VERSION = 3
@Database(version = DATABASE_VERSION, @Database(version = DATABASE_VERSION,
entities = arrayOf(APSResult::class, Bolus::class, BolusCalculatorResult::class, Carbs::class, entities = [APSResult::class, Bolus::class, BolusCalculatorResult::class, Carbs::class,
EffectiveProfileSwitch::class, ExtendedBolus::class, GlucoseValue::class, ProfileSwitch::class, EffectiveProfileSwitch::class, ExtendedBolus::class, GlucoseValue::class, ProfileSwitch::class,
TemporaryBasal::class, TemporaryTarget::class, TherapyEvent::class, TotalDailyDose::class, TemporaryBasal::class, TemporaryTarget::class, TherapyEvent::class, TotalDailyDose::class, APSResultLink::class,
APSResultLink::class, MealLink::class, MultiwaveBolusLink::class, PreferenceChange::class, MealLink::class, MultiwaveBolusLink::class, PreferenceChange::class, VersionChange::class, UserEntry::class],
VersionChange::class, UserEntry::class),
exportSchema = true) exportSchema = true)
@TypeConverters(Converters::class) @TypeConverters(Converters::class)
internal abstract class AppDatabase : RoomDatabase() { internal abstract class AppDatabase : RoomDatabase() {

1
database/src/main/java/info/nightscout/androidaps/database/DatabaseModule.kt
View file

@ -22,6 +22,7 @@ open class DatabaseModule {
Room Room
.databaseBuilder(context, AppDatabase::class.java, fileName) .databaseBuilder(context, AppDatabase::class.java, fileName)
.addMigrations(migration1to2) .addMigrations(migration1to2)
.fallbackToDestructiveMigration()
.build() .build()
@Qualifier @Qualifier