Ensure contexts are reset and rollback when transaction is cancelled before exiting withTransaction

roanutil · roanutil · commit ab6b1d98eb29 · 2025-06-24T12:22:05.000-05:00
feature/transactions
diff --git a/Sources/CoreDataRepository/CoreDataRepository.swift b/Sources/CoreDataRepository/CoreDataRepository.swift
@@ -70,7 +70,11 @@ public final class CoreDataRepository: @unchecked Sendable {
                     return result
                 }
                 try scratchPad.performAndWait {
-                    guard scratchPad.hasChanges, !transaction.canceled else {
+                    guard scratchPad.hasChanges else {
+                        return
+                    }
+                    guard !transaction.canceled else {
+                        scratchPad.reset()
                         return
                     }
                     do {
@@ -81,7 +85,11 @@ public final class CoreDataRepository: @unchecked Sendable {
                     }
                 }
                 try context.performAndWait {
-                    guard context.hasChanges, !transaction.canceled else {
+                    guard context.hasChanges else {
+                        return
+                    }
+                    guard !transaction.canceled else {
+                        context.rollback()
                         return
                     }
                     context.transactionAuthor = transactionAuthor

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,11 @@ public final class CoreDataRepository: @unchecked Sendable {`
`70`	`70`	`return result`
`71`	`71`	`}`
`72`	`72`	`try scratchPad.performAndWait {`
`73`		`- guard scratchPad.hasChanges, !transaction.canceled else {`
	`73`	`+ guard scratchPad.hasChanges else {`
	`74`	`+ return`
	`75`	`+ }`
	`76`	`+ guard !transaction.canceled else {`
	`77`	`+ scratchPad.reset()`
`74`	`78`	`return`
`75`	`79`	`}`
`76`	`80`	`do {`
`@@ -81,7 +85,11 @@ public final class CoreDataRepository: @unchecked Sendable {`
`81`	`85`	`}`
`82`	`86`	`}`
`83`	`87`	`try context.performAndWait {`
`84`		`- guard context.hasChanges, !transaction.canceled else {`
	`88`	`+ guard context.hasChanges else {`
	`89`	`+ return`
	`90`	`+ }`
	`91`	`+ guard !transaction.canceled else {`
	`92`	`+ context.rollback()`
`85`	`93`	`return`
`86`	`94`	`}`
`87`	`95`	`context.transactionAuthor = transactionAuthor`