starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-01-18 06:57:15 +01:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

declare operators as static functions

Browse Source
This commit is contained in:
John Rommel Estropia
2017-02-19 20:05:23 +09:00
parent c40d17a6ad
commit 9ff1c9d545
2 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Sources/Fetching and Querying/Concrete Clauses/OrderBy.swift
View File

@@ -27,17 +27,6 @@ import Foundation
import CoreData
public func + (left: OrderBy, right: OrderBy) -> OrderBy {
return OrderBy(left.sortDescriptors + right.sortDescriptors)
}
public func += (left: inout OrderBy, right: OrderBy) {
left = left + right
}
// MARK: - KeyPath
public typealias KeyPath = String
@@ -69,6 +58,22 @@ public enum SortKey {
*/
public struct OrderBy: FetchClause, QueryClause, DeleteClause, Hashable {
/**
Combines two `OrderBy` sort descriptors together
*/
public static func + (left: OrderBy, right: OrderBy) -> OrderBy {
return OrderBy(left.sortDescriptors + right.sortDescriptors)
}
/**
Combines two `OrderBy` sort descriptors together and stores the result to the left operand
*/
public static func += (left: inout OrderBy, right: OrderBy) {
left = left + right
}
/**
The list of sort descriptors
*/

40
Sources/Fetching and Querying/Concrete Clauses/Where.swift
View File

@@ -27,22 +27,6 @@ import Foundation
import CoreData
public func && (left: Where, right: Where) -> Where {
return Where(NSCompoundPredicate(type: .and, subpredicates: [left.predicate, right.predicate]))
}
public func || (left: Where, right: Where) -> Where {
return Where(NSCompoundPredicate(type: .or, subpredicates: [left.predicate, right.predicate]))
}
public prefix func ! (clause: Where) -> Where {
return Where(NSCompoundPredicate(type: .not, subpredicates: [clause.predicate]))
}
// MARK: - Where
/**
@@ -50,6 +34,30 @@ public prefix func ! (clause: Where) -> Where {
*/
public struct Where: FetchClause, QueryClause, DeleteClause, Hashable {
/**
Combines two `Where` predicates together using `AND` operator
*/
public static func && (left: Where, right: Where) -> Where {
return Where(NSCompoundPredicate(type: .and, subpredicates: [left.predicate, right.predicate]))
}
/**
Combines two `Where` predicates together using `OR` operator
*/
public static func || (left: Where, right: Where) -> Where {
return Where(NSCompoundPredicate(type: .or, subpredicates: [left.predicate, right.predicate]))
}
/**
Inverts the predicate of a `Where` clause using `NOT` operator
*/
public static prefix func ! (clause: Where) -> Where {
return Where(NSCompoundPredicate(type: .not, subpredicates: [clause.predicate]))
}
/**
The `NSPredicate` for the fetch or query
*/