Merge branch 'feature/grdb6' into 'development'

Update to GRDB v6

See merge request elixxir/client-ios-db!33

Package.resolved

@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/groue/GRDB.swift",
       "state" : {
-        "revision" : "fead2ea634c1bf7dd81a3e02f796154992165ffd",
-        "version" : "5.24.0"
+        "revision" : "0ac435744a4c67c4ec23a4a671c0d53ce1fee7c6",
+        "version" : "6.0.0"
       }
     },
     {
@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-custom-dump.git",
       "state" : {
-        "revision" : "c4f78db9b90ca57b7b6abc2223e235242739ea3c",
-        "version" : "0.4.0"
+        "revision" : "c9b6b940d95c0a925c63f6858943415714d8a981",
+        "version" : "0.5.2"
       }
     },
     {
@@ -23,8 +23,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-snapshot-testing.git",
       "state" : {
-        "revision" : "f8a9c997c3c1dab4e216a8ec9014e23144cbab37",
-        "version" : "1.9.0"
+        "revision" : "f29e2014f6230cf7d5138fc899da51c7f513d467",
+        "version" : "1.10.0"
       }
     },
     {

Package.swift

@@ -19,9 +19,9 @@ let package = Package(
     .library(name: "XXDatabase", targets: ["XXDatabase"]),
   ],
   dependencies: [
-    .package(url: "https://github.com/groue/GRDB.swift", .upToNextMajor(from: "5.24.0")),
-    .package(url: "https://github.com/pointfreeco/swift-custom-dump.git", .upToNextMajor(from: "0.4.0")),
-    .package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", .upToNextMajor(from: "1.9.0")),
+    .package(url: "https://github.com/groue/GRDB.swift", .upToNextMajor(from: "6.0.0")),
+    .package(url: "https://github.com/pointfreeco/swift-custom-dump.git", .upToNextMajor(from: "0.5.2")),
+    .package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", .upToNextMajor(from: "1.10.0")),
     .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay.git", .upToNextMajor(from: "0.4.1")),
   ],
   targets: [

Sources/XXDatabase/Models/Message+GRDB.swift

@@ -119,9 +119,7 @@ extension Message: FetchableRecord, MutablePersistableRecord {
     return columnAssignments
   }
 
-  public mutating func didInsert(with rowID: Int64, for column: String?) {
-    if column == Column.id.rawValue {
-      id = rowID
-    }
+  public mutating func didInsert(_ inserted: InsertionSuccess) {
+    id = inserted.rowID
   }
 }

Sources/XXLegacyDatabaseMigrator/Legacy/Contact.swift

@@ -37,9 +37,7 @@ extension Contact: FetchableRecord, MutablePersistableRecord {
 
   static let databaseTableName = "contacts"
 
-  mutating func didInsert(with rowID: Int64, for column: String?) {
-    if column == Column.id.rawValue {
-      id = rowID
-    }
+  mutating func didInsert(_ inserted: InsertionSuccess) {
+    id = inserted.rowID
   }
 }

Sources/XXLegacyDatabaseMigrator/Legacy/FileTransfer.swift

@@ -17,9 +17,7 @@ extension FileTransfer: FetchableRecord, MutablePersistableRecord {
 
   static let databaseTableName = "transfers"
 
-  mutating func didInsert(with rowID: Int64, for column: String?) {
-    if column == Column.id.rawValue {
-      id = rowID
-    }
+  mutating func didInsert(_ inserted: InsertionSuccess) {
+    id = inserted.rowID
   }
 }

Sources/XXLegacyDatabaseMigrator/Legacy/Group.swift

@@ -25,9 +25,7 @@ extension Group: FetchableRecord, MutablePersistableRecord {
 
   static let databaseTableName = "groups"
 
-  mutating func didInsert(with rowID: Int64, for column: String?) {
-    if column == Column.id.rawValue {
-      id = rowID
-    }
+  mutating func didInsert(_ inserted: InsertionSuccess) {
+    id = inserted.rowID
   }
 }

Sources/XXLegacyDatabaseMigrator/Legacy/GroupMember.swift

@@ -20,9 +20,7 @@ extension GroupMember: FetchableRecord, MutablePersistableRecord {
     case id, photo, status, userId, groupId, username
   }
 
-  mutating func didInsert(with rowID: Int64, for column: String?) {
-    if column == Column.id.rawValue {
-      id = rowID
-    }
+  mutating func didInsert(_ inserted: InsertionSuccess) {
+    id = inserted.rowID
   }
 }

Sources/XXLegacyDatabaseMigrator/Legacy/GroupMessage.swift

@@ -30,9 +30,7 @@ extension GroupMessage: FetchableRecord, MutablePersistableRecord {
 
   static let databaseTableName = "groupMessages"
 
-  mutating func didInsert(with rowID: Int64, for column: String?) {
-    if column == Column.id.rawValue {
-      id = rowID
-    }
+  mutating func didInsert(_ inserted: InsertionSuccess) {
+    id = inserted.rowID
   }
 }

Sources/XXLegacyDatabaseMigrator/Legacy/Message.swift

@@ -33,9 +33,7 @@ extension Message: FetchableRecord, MutablePersistableRecord {
 
   static let databaseTableName = "messages"
 
-  mutating func didInsert(with rowID: Int64, for column: String?) {
-    if column == Column.id.rawValue {
-      id = rowID
-    }
+  mutating func didInsert(_ inserted: InsertionSuccess) {
+    id = inserted.rowID
   }
 }

Tests/XXDatabaseTests/Database+GRDBTests.swift

@@ -9,7 +9,7 @@ final class DatabaseGRDBTests: XCTestCase {
   var writer: DatabaseWriter!
 
   override func setUp() async throws {
-    writer = DatabaseQueue()
+    writer = try DatabaseQueue()
     db = try Database.grdb(
       writer: writer,
       queue: DispatchQueue(label: "XXDatabase"),

Tests/XXDatabaseTests/Group+GRDBTests.swift

@@ -9,7 +9,7 @@ final class GroupGRDBTests: XCTestCase {
   var writer: DatabaseWriter!
 
   override func setUp() async throws {
-    writer = DatabaseQueue()
+    writer = try DatabaseQueue()
     db = try Database.grdb(
       writer: writer,
       queue: DispatchQueue(label: "XXDatabase"),

Tests/XXDatabaseTests/GroupMember+GRDBTests.swift

@@ -9,7 +9,7 @@ final class GroupMemberGRDBTests: XCTestCase {
   var writer: DatabaseWriter!
 
   override func setUp() async throws {
-    writer = DatabaseQueue()
+    writer = try DatabaseQueue()
     db = try Database.grdb(
       writer: writer,
       queue: DispatchQueue(label: "XXDatabase"),

Tests/XXLegacyDatabaseMigratorTests/MigratorTests.swift

@@ -125,7 +125,7 @@ final class MigratorTests: XCTestCase {
   func testMigratingLegacyDatabase1() throws {
     let path = Bundle.module.path(forResource: "legacy_database_1", ofType: "sqlite")!
     let legacyDb = try LegacyDatabase(path: path)
-    let newDbQueue = DatabaseQueue()
+    let newDbQueue = try DatabaseQueue()
     let newDb = try XXModels.Database.grdb(writer: newDbQueue)
     let currentDate = Date(timeIntervalSince1970: 1234)
     let migrate = Migrator.live(currentDate: { currentDate })
@@ -150,7 +150,7 @@ final class MigratorTests: XCTestCase {
   func testMigratingLegacyDatabase2() throws {
     let path = Bundle.module.path(forResource: "legacy_database_2", ofType: "sqlite")!
     let legacyDb = try LegacyDatabase(path: path)
-    let newDbQueue = DatabaseQueue()
+    let newDbQueue = try DatabaseQueue()
     let newDb = try XXModels.Database.grdb(writer: newDbQueue)
     let currentDate = Date(timeIntervalSince1970: 1234)
     let migrate = Migrator.live(currentDate: { currentDate })