Fix database insert for Entity and Device registry (#4160)

<!-- Thank you for submitting a Pull Request and helping to improve Home
Assistant. Please complete the following sections to help the processing
and review of your changes. Please do not delete anything from this
template. -->

## Summary
<!-- Provide a brief summary of the changes you have made and most
importantly what they aim to achieve -->

## Screenshots
<!-- If this is a user-facing change not in the frontend, please include
screenshots in light and dark mode. -->

## Link to pull request in Documentation repository
<!-- Pull requests that add, change or remove functionality must have a
corresponding pull request in the Companion App Documentation repository
(https://github.com/home-assistant/companion.home-assistant). Please add
the number of this pull request after the "#" -->
Documentation: home-assistant/companion.home-assistant#

## Any other notes
<!-- If there is any other information of note, like if this Pull
Request is part of a bigger change, please include it here. -->

Author: bgoncal

Sources/Shared/Database/AppDeviceRegistryTable.swift

@@ -4,15 +4,11 @@ import GRDB
 final class AppDeviceRegistryTable: DatabaseTableProtocol {
     func createIfNeeded(database: DatabaseQueue) throws {
         let shouldCreateTable = try database.read { db in
-            try !db.tableExists(GRDBDatabaseTable.appDeviceRegistry.rawValue)
+            try !db.tableExists(GRDBDatabaseTable.deviceRegistry.rawValue)
         }
         if shouldCreateTable {
             try database.write { db in
-                try db.create(table: GRDBDatabaseTable.appDeviceRegistry.rawValue) { t in
-                    t.uniqueKey([
-                        DatabaseTables.DeviceRegistry.serverId.rawValue,
-                        DatabaseTables.DeviceRegistry.deviceId.rawValue,
-                    ])
+                try db.create(table: GRDBDatabaseTable.deviceRegistry.rawValue) { t in
                     // Core identifiers
                     t.column(DatabaseTables.DeviceRegistry.serverId.rawValue, .text).notNull().indexed()
                     t.column(DatabaseTables.DeviceRegistry.deviceId.rawValue, .text).notNull().indexed()
@@ -51,6 +47,12 @@ final class AppDeviceRegistryTable: DatabaseTableProtocol {
                     // Relationships
                     t.column(DatabaseTables.DeviceRegistry.primaryConfigEntry.rawValue, .text)
                     t.column(DatabaseTables.DeviceRegistry.viaDeviceID.rawValue, .text)
+
+                    // ID
+                    t.uniqueKey([
+                        DatabaseTables.DeviceRegistry.serverId.rawValue,
+                        DatabaseTables.DeviceRegistry.deviceId.rawValue,
+                    ])
                 }
             }
         }

Sources/Shared/Database/AppEntityRegistryTable.swift

@@ -4,23 +4,15 @@ import GRDB
 final class AppEntityRegistryTable: DatabaseTableProtocol {
     func createIfNeeded(database: DatabaseQueue) throws {
         let shouldCreateTable = try database.read { db in
-            try !db.tableExists(GRDBDatabaseTable.appEntityRegistry.rawValue)
+            try !db.tableExists(GRDBDatabaseTable.entityRegistry.rawValue)
         }
         if shouldCreateTable {
             try database.write { db in
-                try db.create(table: GRDBDatabaseTable.appEntityRegistry.rawValue) { t in
-                    // Primary key (composite of serverId-uniqueId)
-                    t.column(DatabaseTables.EntityRegistry.id.rawValue, .text).primaryKey().notNull()
-
+                try db.create(table: GRDBDatabaseTable.entityRegistry.rawValue) { t in
                     // Core identifiers
                     t.column(DatabaseTables.EntityRegistry.serverId.rawValue, .text).notNull().indexed()
                     t.column(DatabaseTables.EntityRegistry.uniqueId.rawValue, .text).notNull().indexed()
 
-                    // Ensure the combination is unique
-                    t.uniqueKey([
-                        DatabaseTables.EntityRegistry.serverId.rawValue,
-                        DatabaseTables.EntityRegistry.uniqueId.rawValue,
-                    ])
                     t.column(DatabaseTables.EntityRegistry.entityId.rawValue, .text).indexed()
                     t.column(DatabaseTables.EntityRegistry.platform.rawValue, .text)
                     t.column(DatabaseTables.EntityRegistry.configEntryId.rawValue, .text)
@@ -51,6 +43,12 @@ final class AppEntityRegistryTable: DatabaseTableProtocol {
                     t.column(DatabaseTables.EntityRegistry.options.rawValue, .jsonText)
                     t.column(DatabaseTables.EntityRegistry.translationKey.rawValue, .text)
                     t.column(DatabaseTables.EntityRegistry.hasEntityName.rawValue, .boolean)
+
+                    // ID
+                    t.uniqueKey([
+                        DatabaseTables.EntityRegistry.serverId.rawValue,
+                        DatabaseTables.EntityRegistry.uniqueId.rawValue,
+                    ])
                 }
             }
         }

Sources/Shared/Database/DatabaseTables.swift

@@ -6,8 +6,8 @@ public enum GRDBDatabaseTable: String {
     case assistPipelines
     case carPlayConfig
     case appEntityRegistryListForDisplay
-    case appEntityRegistry
-    case appDeviceRegistry
+    case entityRegistry
+    case deviceRegistry
     case appPanel
     case customWidget
     case appArea

Sources/Shared/Environment/AppDatabaseUpdater.swift

@@ -212,6 +212,7 @@ final class AppDatabaseUpdater: AppDatabaseUpdaterProtocol {
                     "error": error.localizedDescription,
                 ]
             ))
+            assertionFailure("Failed to save areas in database: \(error)")
         }
     }
 
@@ -248,6 +249,7 @@ final class AppDatabaseUpdater: AppDatabaseUpdaterProtocol {
                     "error": error.localizedDescription,
                 ]
             ))
+            assertionFailure("Failed to save EntityRegistryListForDisplay in database: \(error)")
         }
     }
 
@@ -281,6 +283,7 @@ final class AppDatabaseUpdater: AppDatabaseUpdaterProtocol {
                     "error": error.localizedDescription,
                 ]
             ))
+            assertionFailure("Failed to save entity registry in database: \(error)")
         }
     }
 
@@ -314,6 +317,7 @@ final class AppDatabaseUpdater: AppDatabaseUpdaterProtocol {
                     "error": error.localizedDescription,
                 ]
             ))
+            assertionFailure("Failed to save device registry in database: \(error)")
         }
     }
 

Sources/Shared/Environment/DeviceRegistryEntry.swift

@@ -113,6 +113,7 @@ public struct DeviceRegistryEntry: Codable, HADataDecodable {
 // MARK: - Database Model
 
 public struct AppDeviceRegistry: Codable, FetchableRecord, PersistableRecord {
+    public static var databaseTableName: String = GRDBDatabaseTable.deviceRegistry.rawValue
     public let serverId: String
 
     public let deviceId: String

Sources/Shared/Environment/EntityRegistry.swift

@@ -132,6 +132,8 @@ public struct EntityRegistryEntry: Codable, HADataDecodable {
 // MARK: - Database Model
 
 public struct AppEntityRegistry: Codable, FetchableRecord, PersistableRecord {
+    public static var databaseTableName: String = GRDBDatabaseTable.entityRegistry.rawValue
+
     public let serverId: String
 
     // All EntityRegistryEntry fields
@@ -196,10 +198,6 @@ public struct AppEntityRegistry: Codable, FetchableRecord, PersistableRecord {
         self.hasEntityName = registry.hasEntityName
     }
 
-    public var id: String {
-        "\(serverId)-\(uniqueId)"
-    }
-
     // Computed helpers (same as EntityRegistryEntry)
     public var displayName: String {
         name ?? originalName ?? entityId ?? "-"