working for Swift 2.3!

2026-03-25 10:51:59 +01:00 · 2016-09-17 12:22:25 +09:00
parent 0dbd05b172
commit aa6bceaaf3
15 changed files with 76 additions and 508 deletions
--- a/Sources/Internal/NSManagedObjectContext+Querying.swift
+++ b/Sources/Internal/NSManagedObjectContext+Querying.swift
@@ -205,15 +205,22 @@ internal extension NSManagedObjectContext {
    internal func fetchCount(fetchRequest: NSFetchRequest) -> Int? {
        
        var count = 0
-        var error: NSError?
+        var countError: ErrorType?
        self.performBlockAndWait {
            
-            count = self.countForFetchRequest(fetchRequest, error: &error)
+            do {
+                
+                count = try self.countForFetchRequest(fetchRequest)
+            }
+            catch {
+                
+                countError = error
+            }
        }
        if count == NSNotFound {
            
            CoreStore.log(
-                CoreStoreError(error),
+                CoreStoreError(countError),
                "Failed executing fetch request."
            )
            return nil