Merge branch 'develop' of https://github.com/Alecrim/AlecrimCoreData …

…into develop
Alecrim · Oct 18, 2016 · 4cdb803 · 4cdb803
2 parents c333d39 + af45292
commit 4cdb803
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Source/AlecrimCoreData/Core/Protocols/CoreDataQueryable.swift b/Source/AlecrimCoreData/Core/Protocols/CoreDataQueryable.swift
@@ -50,31 +50,31 @@ extension CoreDataQueryable {
 
     public final func sum<U>(_ closure: (Self.Element.Type) -> Attribute<U>) -> U {
         let attribute = closure(Self.Element.self)
-        return self.aggregate(using: "sum", attribute: attribute)
+        return self.aggregate(withFunctionName: "sum", attribute: attribute)
     }
 
     public final func min<U>(_ closure: (Self.Element.Type) -> Attribute<U>) -> U {
         let attribute = closure(Self.Element.self)
-        return self.aggregate(using: "min", attribute: attribute)
+        return self.aggregate(withFunctionName: "min", attribute: attribute)
     }
 
     public final func max<U>(_ closure: (Self.Element.Type) -> Attribute<U>) -> U {
         let attribute = closure(Self.Element.self)
-        return self.aggregate(using: "max", attribute: attribute)
+        return self.aggregate(withFunctionName: "max", attribute: attribute)
     }
 
     // same as average, for convenience
     public final func avg<U>(_ closure: (Self.Element.Type) -> Attribute<U>) -> U {
         let attribute = closure(Self.Element.self)
-        return self.aggregate(using: "average", attribute: attribute)
+        return self.aggregate(withFunctionName: "average", attribute: attribute)
     }
 
     public final func average<U>(_ closure: (Self.Element.Type) -> Attribute<U>) -> U {
         let attribute = closure(Self.Element.self)
-        return self.aggregate(using: "average", attribute: attribute)
+        return self.aggregate(withFunctionName: "average", attribute: attribute)
     }
 
-    private final func aggregate<U>(using functionName: String, attribute: Attribute<U>) -> U {
+    private final func aggregate<U>(withFunctionName functionName: String, attribute: Attribute<U>) -> U {
         let attributeDescription = self.entityDescription.attributesByName[attribute.___name]!
 
         let keyPathExpression = NSExpression(forKeyPath: attribute.___name)

diff --git a/Source/AlecrimCoreData/Core/Protocols/TableProtocol.swift b/Source/AlecrimCoreData/Core/Protocols/TableProtocol.swift
@@ -49,7 +49,7 @@ extension TableProtocol {
                 objectIDs = try fetchRequest.execute()
             }
             else {
-                objectIDs = try! self.context.fetch(fetchRequest)
+                objectIDs = try self.context.fetch(fetchRequest)
             }
 
             for objectID in objectIDs {