feat(import): include redisDatabase in dedup key for Redis connections

Author: J2TeamNNL

TablePro/Core/Services/Export/ConnectionExportService.swift

@@ -886,7 +886,7 @@ enum ConnectionExportService {
             components: [
                 normalizedLookupKey(connection.host),
                 String(connection.port),
-                normalizedLookupKey(connection.database),
+                effectiveDatabaseKey(database: connection.database, redisDatabase: connection.redisDatabase),
                 normalizedLookupKey(connection.username)
             ]
         )
@@ -897,12 +897,23 @@ enum ConnectionExportService {
             components: [
                 normalizedLookupKey(connection.host),
                 String(connection.port),
-                normalizedLookupKey(connection.database),
+                effectiveDatabaseKey(database: connection.database, redisDatabase: connection.redisDatabase),
                 normalizedLookupKey(connection.username)
             ]
         )
     }
 
+    private static func effectiveDatabaseKey(database: String?, redisDatabase: Int?) -> String {
+        let normalized = normalizedLookupKey(database)
+        if !normalized.isEmpty {
+            return normalized
+        }
+        if let redisDatabase {
+            return String(redisDatabase)
+        }
+        return ""
+    }
+
     private static func tagIdsByName() -> [String: UUID] {
         var idsByName: [String: UUID] = [:]
         for tag in TagStorage.shared.loadTags() {

TableProTests/Core/Services/ConnectionImportServiceTests.swift

@@ -100,6 +100,100 @@ struct ConnectionImportServiceTests {
         }
     }
 
+    @Test("redis connections with different database indices are not duplicates")
+    func redisConnectionsWithDifferentDatabaseIndicesAreNotDuplicates() {
+        let existing = DatabaseConnection(
+            name: "Redis DB 0",
+            host: "redis.example.com",
+            port: 6_379,
+            username: "cache",
+            type: .redis,
+            redisDatabase: 0
+        )
+        let imported = ExportableConnection(
+            name: "Redis DB 1",
+            host: "redis.example.com",
+            port: 6_379,
+            database: "",
+            username: "cache",
+            type: "Redis",
+            sshConfig: nil,
+            sslConfig: nil,
+            color: nil,
+            tagName: nil,
+            groupName: nil,
+            sshProfileId: nil,
+            safeModeLevel: nil,
+            aiPolicy: nil,
+            additionalFields: nil,
+            redisDatabase: 1,
+            startupCommands: nil,
+            localOnly: nil
+        )
+
+        let preview = ConnectionExportService.analyzeImport(
+            makeEnvelope(with: [imported]),
+            existingConnections: [existing],
+            registeredTypeIds: Set(["Redis"]),
+            fileExists: { _ in true }
+        )
+
+        guard let item = preview.items.first else {
+            Issue.record("Expected preview item")
+            return
+        }
+
+        if case .duplicate = item.status {
+            Issue.record("Expected non-duplicate status for different Redis database indices")
+        }
+    }
+
+    @Test("redis connections with matching database indices are duplicates")
+    func redisConnectionsWithMatchingDatabaseIndicesAreDuplicates() {
+        let existing = DatabaseConnection(
+            name: "Redis DB 0",
+            host: "redis.example.com",
+            port: 6_379,
+            username: "cache",
+            type: .redis,
+            redisDatabase: 0
+        )
+        let imported = ExportableConnection(
+            name: "Redis DB 0 Copy",
+            host: "redis.example.com",
+            port: 6_379,
+            database: "",
+            username: "cache",
+            type: "Redis",
+            sshConfig: nil,
+            sslConfig: nil,
+            color: nil,
+            tagName: nil,
+            groupName: nil,
+            sshProfileId: nil,
+            safeModeLevel: nil,
+            aiPolicy: nil,
+            additionalFields: nil,
+            redisDatabase: 0,
+            startupCommands: nil,
+            localOnly: nil
+        )
+
+        let preview = ConnectionExportService.analyzeImport(
+            makeEnvelope(with: [imported]),
+            existingConnections: [existing],
+            registeredTypeIds: Set(["Redis"]),
+            fileExists: { _ in true }
+        )
+
+        guard case .duplicate(let matched) = preview.items.first?.status else {
+            Issue.record("Expected duplicate status for matching Redis database indices")
+            return
+        }
+
+        #expect(matched.id == existing.id)
+    }
+
     @Test("replace updates the existing connection")
     func replaceUpdatesTheExistingConnection() {
         let storage = makeStorage()