Removing automigration related warnings as well as nullable collection parameter warnings in preparation for turning on the Kotlin CodeGen testapp.
Test: AutoMigrationWriterTest.kt, BoxedNonNullTypesTest.kt
Bug: 127483380
Change-Id: I6833210feb3dbfa05cac7d3b96eaf467d3365fa7
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/BoxedNonNullTypesTest.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/BoxedNonNullTypesTest.kt
index ad51bc4..4e010f3 100644
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/BoxedNonNullTypesTest.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/BoxedNonNullTypesTest.kt
@@ -212,6 +212,7 @@
@Query("SELECT value FROM MyEntity")
fun getAsList(): List<Long>
+ @Suppress("ROOM_UNNECESSARY_NULLABILITY_IN_DAO_RETURN_TYPE")
@Query("SELECT value FROM MyNullableEntity")
fun getAsNullableList(): List<Long?>
diff --git a/room/room-compiler/src/main/kotlin/androidx/room/writer/AutoMigrationWriter.kt b/room/room-compiler/src/main/kotlin/androidx/room/writer/AutoMigrationWriter.kt
index d453f00..24cad40 100644
--- a/room/room-compiler/src/main/kotlin/androidx/room/writer/AutoMigrationWriter.kt
+++ b/room/room-compiler/src/main/kotlin/androidx/room/writer/AutoMigrationWriter.kt
@@ -108,11 +108,11 @@
).apply {
addParameter(
typeName = SupportDbTypeNames.DB,
- name = "database",
+ name = "db",
)
addMigrationStatements(this)
if (autoMigration.specClassName != null) {
- addStatement("callback.onPostMigrate(database)")
+ addStatement("callback.onPostMigrate(db)")
}
}
return migrateFunctionBuilder.build()
@@ -375,7 +375,7 @@
migrateBuilder: XFunSpec.Builder
) {
migrateBuilder.addStatement(
- "%T.foreignKeyCheck(database, %S)",
+ "%T.foreignKeyCheck(db, %S)",
RoomTypeNames.DB_UTIL,
tableName
)
@@ -477,7 +477,7 @@
sql: String
) {
migrateBuilder.addStatement(
- "database.execSQL(%S)",
+ "db.execSQL(%S)",
sql
)
}
diff --git a/room/room-compiler/src/test/test-data/autoMigrationWriter/output/java/AutoMigrationWithProvidedSpec.java b/room/room-compiler/src/test/test-data/autoMigrationWriter/output/java/AutoMigrationWithProvidedSpec.java
index 291dfc9..3b85860 100644
--- a/room/room-compiler/src/test/test-data/autoMigrationWriter/output/java/AutoMigrationWithProvidedSpec.java
+++ b/room/room-compiler/src/test/test-data/autoMigrationWriter/output/java/AutoMigrationWithProvidedSpec.java
@@ -19,8 +19,8 @@
}
@Override
- public void migrate(@NonNull final SupportSQLiteDatabase database) {
- database.execSQL("ALTER TABLE `Song` ADD COLUMN `artistId` INTEGER DEFAULT NULL");
- callback.onPostMigrate(database);
+ public void migrate(@NonNull final SupportSQLiteDatabase db) {
+ db.execSQL("ALTER TABLE `Song` ADD COLUMN `artistId` INTEGER DEFAULT NULL");
+ callback.onPostMigrate(db);
}
}
diff --git a/room/room-compiler/src/test/test-data/autoMigrationWriter/output/java/ValidAutoMigrationWithDefault.java b/room/room-compiler/src/test/test-data/autoMigrationWriter/output/java/ValidAutoMigrationWithDefault.java
index 04f2885..6ea72a6 100644
--- a/room/room-compiler/src/test/test-data/autoMigrationWriter/output/java/ValidAutoMigrationWithDefault.java
+++ b/room/room-compiler/src/test/test-data/autoMigrationWriter/output/java/ValidAutoMigrationWithDefault.java
@@ -18,8 +18,8 @@
}
@Override
- public void migrate(@NonNull final SupportSQLiteDatabase database) {
- database.execSQL("ALTER TABLE `Song` ADD COLUMN `artistId` INTEGER NOT NULL DEFAULT 0");
- callback.onPostMigrate(database);
+ public void migrate(@NonNull final SupportSQLiteDatabase db) {
+ db.execSQL("ALTER TABLE `Song` ADD COLUMN `artistId` INTEGER NOT NULL DEFAULT 0");
+ callback.onPostMigrate(db);
}
}
diff --git a/room/room-compiler/src/test/test-data/autoMigrationWriter/output/java/ValidAutoMigrationWithoutDefault.java b/room/room-compiler/src/test/test-data/autoMigrationWriter/output/java/ValidAutoMigrationWithoutDefault.java
index e1b545d..23b966a 100644
--- a/room/room-compiler/src/test/test-data/autoMigrationWriter/output/java/ValidAutoMigrationWithoutDefault.java
+++ b/room/room-compiler/src/test/test-data/autoMigrationWriter/output/java/ValidAutoMigrationWithoutDefault.java
@@ -18,8 +18,8 @@
}
@Override
- public void migrate(@NonNull final SupportSQLiteDatabase database) {
- database.execSQL("ALTER TABLE `Song` ADD COLUMN `artistId` INTEGER DEFAULT NULL");
- callback.onPostMigrate(database);
+ public void migrate(@NonNull final SupportSQLiteDatabase db) {
+ db.execSQL("ALTER TABLE `Song` ADD COLUMN `artistId` INTEGER DEFAULT NULL");
+ callback.onPostMigrate(db);
}
}
diff --git a/room/room-compiler/src/test/test-data/autoMigrationWriter/output/kotlin/AutoMigrationWithProvidedSpec.kt b/room/room-compiler/src/test/test-data/autoMigrationWriter/output/kotlin/AutoMigrationWithProvidedSpec.kt
index 37881af..0aa6850 100644
--- a/room/room-compiler/src/test/test-data/autoMigrationWriter/output/kotlin/AutoMigrationWithProvidedSpec.kt
+++ b/room/room-compiler/src/test/test-data/autoMigrationWriter/output/kotlin/AutoMigrationWithProvidedSpec.kt
@@ -16,8 +16,8 @@
this.callback = callback
}
- public override fun migrate(database: SupportSQLiteDatabase): Unit {
- database.execSQL("ALTER TABLE `Song` ADD COLUMN `artistId` INTEGER DEFAULT NULL")
- callback.onPostMigrate(database)
+ public override fun migrate(db: SupportSQLiteDatabase): Unit {
+ db.execSQL("ALTER TABLE `Song` ADD COLUMN `artistId` INTEGER DEFAULT NULL")
+ callback.onPostMigrate(db)
}
}
\ No newline at end of file
diff --git a/room/room-compiler/src/test/test-data/autoMigrationWriter/output/kotlin/ValidAutoMigrationWithDefault.kt b/room/room-compiler/src/test/test-data/autoMigrationWriter/output/kotlin/ValidAutoMigrationWithDefault.kt
index 0935428..778f927 100644
--- a/room/room-compiler/src/test/test-data/autoMigrationWriter/output/kotlin/ValidAutoMigrationWithDefault.kt
+++ b/room/room-compiler/src/test/test-data/autoMigrationWriter/output/kotlin/ValidAutoMigrationWithDefault.kt
@@ -14,8 +14,8 @@
public constructor() : super(1, 2)
- public override fun migrate(database: SupportSQLiteDatabase): Unit {
- database.execSQL("ALTER TABLE `Song` ADD COLUMN `artistId` INTEGER NOT NULL DEFAULT 0")
- callback.onPostMigrate(database)
+ public override fun migrate(db: SupportSQLiteDatabase): Unit {
+ db.execSQL("ALTER TABLE `Song` ADD COLUMN `artistId` INTEGER NOT NULL DEFAULT 0")
+ callback.onPostMigrate(db)
}
}
\ No newline at end of file
diff --git a/room/room-compiler/src/test/test-data/autoMigrationWriter/output/kotlin/ValidAutoMigrationWithoutDefault.kt b/room/room-compiler/src/test/test-data/autoMigrationWriter/output/kotlin/ValidAutoMigrationWithoutDefault.kt
index e87904e..e253bb2 100644
--- a/room/room-compiler/src/test/test-data/autoMigrationWriter/output/kotlin/ValidAutoMigrationWithoutDefault.kt
+++ b/room/room-compiler/src/test/test-data/autoMigrationWriter/output/kotlin/ValidAutoMigrationWithoutDefault.kt
@@ -14,8 +14,8 @@
public constructor() : super(1, 2)
- public override fun migrate(database: SupportSQLiteDatabase): Unit {
- database.execSQL("ALTER TABLE `Song` ADD COLUMN `artistId` INTEGER DEFAULT NULL")
- callback.onPostMigrate(database)
+ public override fun migrate(db: SupportSQLiteDatabase): Unit {
+ db.execSQL("ALTER TABLE `Song` ADD COLUMN `artistId` INTEGER DEFAULT NULL")
+ callback.onPostMigrate(db)
}
}
\ No newline at end of file