From a2108541523a98cb45e663db16acaf3db4d28486 Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Fri, 23 Sep 2022 16:21:16 +0200
Subject: [PATCH] FIx MutablePersistableRecord.didInsert usage

---
 Sources/XXDatabase/Models/Message+GRDB.swift               | 6 ++----
 Sources/XXLegacyDatabaseMigrator/Legacy/Contact.swift      | 6 ++----
 Sources/XXLegacyDatabaseMigrator/Legacy/FileTransfer.swift | 6 ++----
 Sources/XXLegacyDatabaseMigrator/Legacy/Group.swift        | 6 ++----
 Sources/XXLegacyDatabaseMigrator/Legacy/GroupMember.swift  | 6 ++----
 Sources/XXLegacyDatabaseMigrator/Legacy/GroupMessage.swift | 6 ++----
 Sources/XXLegacyDatabaseMigrator/Legacy/Message.swift      | 6 ++----
 7 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/Sources/XXDatabase/Models/Message+GRDB.swift b/Sources/XXDatabase/Models/Message+GRDB.swift
index d242a67..9adda88 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 cd42ecf..1f5bb4e 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 27b4a62..d63afb1 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 d2328de..6789f76 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 244fa39..f9efb99 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 31c2be0..8320ed7 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 25e58fe..e7a76d3 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
   }
 }
-- 
GitLab