NSManagedObjectContextのsave関連メソッドでNSErrorを返すように修正

ubiregiinc · Oct 6, 2023 · d134e17 · d134e17
1 parent fb9f7df
commit d134e17
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/Sources/UBICoreData/NSManagedObjectContext+UBICoreData.h b/Sources/UBICoreData/NSManagedObjectContext+UBICoreData.h
@@ -15,7 +15,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (NSManagedObjectContext *)newPrivateQueueContext;
 
 - (BOOL)save;
+- (BOOL)saveWithError:(NSError **)error;
 - (BOOL)saveToPersistentStore;
+- (BOOL)saveToPersistentStoreWithError:(NSError **)error;
 
 @end
 

diff --git a/Sources/UBICoreData/NSManagedObjectContext+UBICoreData.m b/Sources/UBICoreData/NSManagedObjectContext+UBICoreData.m
@@ -28,25 +28,39 @@ - (NSManagedObjectContext *)newPrivateQueueContext
     return context;
 }
 
-- (BOOL)save
+-(BOOL)save
+{
+    return [self saveWithError:nil];
+}
+
+- (BOOL)saveWithError:(NSError **)error
 {
     if (![self hasChanges]) {
         return YES;
     }
 
-    NSError* error = nil;
+    NSError* localError = nil;
 
-    if (![self save:&error]) {
+    if (![self save:&localError]) {
 #ifdef DEBUG
-        NSLog(@"%s - error: %@", __PRETTY_FUNCTION__, [error userInfo]);
+        NSLog(@"%s - error: %@", __PRETTY_FUNCTION__, [localError userInfo]);
 #endif
+        if (error) {
+            *error = localError;
+        }
+
         return NO;
     }
 
     return YES;
 }
 
 - (BOOL)saveToPersistentStore
+{
+    return [self saveToPersistentStoreWithError:nil];
+}
+
+- (BOOL)saveToPersistentStoreWithError:(NSError **)error
 {
     NSSet *insertedObjects = self.insertedObjects;
     if (insertedObjects.count > 0) {
@@ -58,7 +72,7 @@ - (BOOL)saveToPersistentStore
         }
     }
 
-    if ([self save]) {
+    if ([self saveWithError:error]) {
         NSManagedObjectContext *context = [self parentContext];
 
         if (!context) {
@@ -68,7 +82,7 @@ - (BOOL)saveToPersistentStore
         __block BOOL save = NO;
 
         [context performBlockAndWait:^{
-            save = [context saveToPersistentStore];
+            save = [context saveToPersistentStoreWithError:error];
         }];
 
         return save;