starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-03-17 23:14:05 +01:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

Merge branch 'develop' into prototype/Swift_3_2

Browse Source 
# Conflicts:
#	Sources/AttributeProtocol.swift
#	Sources/DynamicSchema+Convenience.swift
#	Sources/ImportableAttributeType.swift
#	Sources/Relationship.swift
#	Sources/RelationshipProtocol.swift
#	Sources/Transformable.swift
#	Sources/Value.swift
This commit is contained in:
John Rommel Estropia
2017-08-16 21:07:34 +09:00
parent 74c64619c3 86be046c9f
commit 9922deac4d
6 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Sources/Where.swift
View File

@@ -50,13 +50,11 @@ public struct Where: FetchClause, QueryClause, DeleteClause, Hashable {
*/
public static func && (left: Where, right: Where?) -> Where {
if right != nil {
return left && right!
}
else {
if let right = right {
return left
return left && right
}
return left
}
/**
@@ -67,13 +65,11 @@ public struct Where: FetchClause, QueryClause, DeleteClause, Hashable {
*/
public static func && (left: Where?, right: Where) -> Where {
if left != nil {
if let left = left {
return left && right
}
else {
return right
}
return right
}
/**
@@ -92,13 +88,11 @@ public struct Where: FetchClause, QueryClause, DeleteClause, Hashable {
*/
public static func || (left: Where, right: Where?) -> Where {
if right != nil {
return left || right!
}
else {
if let right = right {
return left
return left || right
}
return left
}
/**
@@ -109,13 +103,11 @@ public struct Where: FetchClause, QueryClause, DeleteClause, Hashable {
*/
public static func || (left: Where?, right: Where) -> Where {
if left != nil {
if let left = left {
return left || right
}
else {
return right
}
return right
}
/**