diff --git a/Package.resolved b/Package.resolved
index 25d429cff7a6313b3ab32cbc0098a6df1097d4dc..57f42aceb83943cb7bab184c1b6e4f9275e6de3e 100644
--- a/Package.resolved
+++ b/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"
       }
     },
     {
diff --git a/Package.swift b/Package.swift
index 741045ab6d400bac40d895ff9d1083bd4a7ad2ad..550624a500043b7f97be842115fc567d441dd5a0 100644
--- a/Package.swift
+++ b/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: [
diff --git a/Sources/XXDatabase/Models/Message+GRDB.swift b/Sources/XXDatabase/Models/Message+GRDB.swift
index d242a67d2a48510bf27a123b8b8441546a715d05..9adda885d3b7d5ea3d19c466366b9668f77720cb 100644
--- a/Sources/XXDatabase/Models/Message+GRDB.swift
+++ b/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
   }
 }
diff --git a/Sources/XXLegacyDatabaseMigrator/Legacy/Contact.swift b/Sources/XXLegacyDatabaseMigrator/Legacy/Contact.swift
index cd42ecf4b435b46f875f20aff21895c203b7551b..1f5bb4ea1ad00c412a23b0c9c8fa19c00d65342e 100644
--- a/Sources/XXLegacyDatabaseMigrator/Legacy/Contact.swift
+++ b/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
   }
 }
diff --git a/Sources/XXLegacyDatabaseMigrator/Legacy/FileTransfer.swift b/Sources/XXLegacyDatabaseMigrator/Legacy/FileTransfer.swift
index 27b4a623854ecf934bcc2c337ab2461ba74618b3..d63afb1c88f098eb208cbe9028e9ad128909b8f4 100644
--- a/Sources/XXLegacyDatabaseMigrator/Legacy/FileTransfer.swift
+++ b/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
   }
 }
diff --git a/Sources/XXLegacyDatabaseMigrator/Legacy/Group.swift b/Sources/XXLegacyDatabaseMigrator/Legacy/Group.swift
index d2328defd36d4183411b974f1848afe5472aea45..6789f76720e9e7b495d601fca8c62ea8dc435b79 100644
--- a/Sources/XXLegacyDatabaseMigrator/Legacy/Group.swift
+++ b/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
   }
 }
diff --git a/Sources/XXLegacyDatabaseMigrator/Legacy/GroupMember.swift b/Sources/XXLegacyDatabaseMigrator/Legacy/GroupMember.swift
index 244fa39dfaf1ee92024815b0c55fdb3b3d5411d6..f9efb997586e0e41b708efd593fdca693925219a 100644
--- a/Sources/XXLegacyDatabaseMigrator/Legacy/GroupMember.swift
+++ b/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
   }
 }
diff --git a/Sources/XXLegacyDatabaseMigrator/Legacy/GroupMessage.swift b/Sources/XXLegacyDatabaseMigrator/Legacy/GroupMessage.swift
index 31c2be042944b761e2405833539487b6fd24cec4..8320ed7165fb55a326035a78bdab8c9869da86b6 100644
--- a/Sources/XXLegacyDatabaseMigrator/Legacy/GroupMessage.swift
+++ b/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
   }
 }
diff --git a/Sources/XXLegacyDatabaseMigrator/Legacy/Message.swift b/Sources/XXLegacyDatabaseMigrator/Legacy/Message.swift
index 25e58febd9a3fbcf749a356476d3353fe28c2a6e..e7a76d34a42abca21cfe3e17349dc696663a45a5 100644
--- a/Sources/XXLegacyDatabaseMigrator/Legacy/Message.swift
+++ b/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
   }
 }
diff --git a/Tests/XXDatabaseTests/Database+GRDBTests.swift b/Tests/XXDatabaseTests/Database+GRDBTests.swift
index f865f73ec32cba205e7d85a7028f138052539d16..67221f1418237a32abf74a3dcde2e36428f8aec2 100644
--- a/Tests/XXDatabaseTests/Database+GRDBTests.swift
+++ b/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"),
diff --git a/Tests/XXDatabaseTests/Group+GRDBTests.swift b/Tests/XXDatabaseTests/Group+GRDBTests.swift
index ad3786a7f8de7725b4b884fa8275473834fad2ad..5454c949a6e2610cee7a68a63a33d63ea5362eaa 100644
--- a/Tests/XXDatabaseTests/Group+GRDBTests.swift
+++ b/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"),
diff --git a/Tests/XXDatabaseTests/GroupMember+GRDBTests.swift b/Tests/XXDatabaseTests/GroupMember+GRDBTests.swift
index a8f6e0e68f82a5475b62ad811ccb8d82db5cad39..419f9431191db8234a46110e2f498538a4c9a5ca 100644
--- a/Tests/XXDatabaseTests/GroupMember+GRDBTests.swift
+++ b/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"),
diff --git a/Tests/XXLegacyDatabaseMigratorTests/MigratorTests.swift b/Tests/XXLegacyDatabaseMigratorTests/MigratorTests.swift
index 68fcbf6f901d6b1e75b802ea2a636afa60c81ebe..d4d46a1a2a5c4b6978a5530d996621bc34c52f6b 100644
--- a/Tests/XXLegacyDatabaseMigratorTests/MigratorTests.swift
+++ b/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 })