Skip to content

Commit cf1edda

Browse files
Fix activityId of ActivityImage being allowed to be null
1 parent a05db5c commit cf1edda

File tree

2 files changed

+6
-5
lines changed
  • app
    • schemas/com.inky.fitnesscalendar.db.AppDatabase
    • src/main/java/com/inky/fitnesscalendar/db/entities

2 files changed

+6
-5
lines changed

app/schemas/com.inky.fitnesscalendar.db.AppDatabase/38.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"formatVersion": 1,
33
"database": {
44
"version": 38,
5-
"identityHash": "8c52dc13699de39291d0c7b7a40010f8",
5+
"identityHash": "a5a53460c102c4cd12f2417c4fb0234d",
66
"entities": [
77
{
88
"tableName": "Activity",
@@ -251,12 +251,13 @@
251251
},
252252
{
253253
"tableName": "ActivityImage",
254-
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`activity_id` INTEGER, `image_name` TEXT NOT NULL, PRIMARY KEY(`image_name`), FOREIGN KEY(`activity_id`) REFERENCES `Activity`(`uid`) ON UPDATE NO ACTION ON DELETE CASCADE )",
254+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`activity_id` INTEGER NOT NULL, `image_name` TEXT NOT NULL, PRIMARY KEY(`image_name`), FOREIGN KEY(`activity_id`) REFERENCES `Activity`(`uid`) ON UPDATE NO ACTION ON DELETE CASCADE )",
255255
"fields": [
256256
{
257257
"fieldPath": "activityId",
258258
"columnName": "activity_id",
259-
"affinity": "INTEGER"
259+
"affinity": "INTEGER",
260+
"notNull": true
260261
},
261262
{
262263
"fieldPath": "imageName",
@@ -697,7 +698,7 @@
697698
],
698699
"setupQueries": [
699700
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
700-
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '8c52dc13699de39291d0c7b7a40010f8')"
701+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'a5a53460c102c4cd12f2417c4fb0234d')"
701702
]
702703
}
703704
}

app/src/main/java/com/inky/fitnesscalendar/db/entities/ActivityImage.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ import kotlinx.parcelize.Parcelize
2222
indices = [Index("activity_id")]
2323
)
2424
data class ActivityImage(
25-
@ColumnInfo(name = "activity_id") val activityId: Int?,
25+
@ColumnInfo(name = "activity_id") val activityId: Int,
2626
@PrimaryKey @ColumnInfo(name = "image_name") val imageName: ImageName
2727
) : Parcelable

0 commit comments

Comments
 (0)