Merge pull request #799 from davedelong/master

Author: Nathan Fallet

Sources/SQLite/Helpers.swift

@@ -73,7 +73,11 @@ extension String {
     }
 
     func infix<T>(_ lhs: Expressible, _ rhs: Expressible, wrap: Bool = true) -> Expression<T> {
-        let expression = Expression<T>(" \(self) ".join([lhs, rhs]).expression)
+        return infix([lhs, rhs], wrap: wrap)
+    }
+    
+    func infix<T>(_ terms: [Expressible], wrap: Bool = true) -> Expression<T> {
+        let expression = Expression<T>(" \(self) ".join(terms).expression)
         guard wrap else {
             return expression
         }

Sources/SQLite/Typed/Operators.swift

@@ -602,6 +602,12 @@ public func ~=<V : Value>(lhs: PartialRangeFrom<V>, rhs: Expression<V?>) -> Expr
 
 // MARK: -
 
+public func and(_ terms: Expression<Bool>...) -> Expression<Bool> {
+    return "AND".infix(terms)
+}
+public func and(_ terms: [Expression<Bool>]) -> Expression<Bool> {
+    return "AND".infix(terms)
+}
 public func &&(lhs: Expression<Bool>, rhs: Expression<Bool>) -> Expression<Bool> {
     return Operator.and.infix(lhs, rhs)
 }
@@ -627,6 +633,12 @@ public func &&(lhs: Bool, rhs: Expression<Bool?>) -> Expression<Bool?> {
     return Operator.and.infix(lhs, rhs)
 }
 
+public func or(_ terms: Expression<Bool>...) -> Expression<Bool> {
+    return "OR".infix(terms)
+}
+public func or(_ terms: [Expression<Bool>]) -> Expression<Bool> {
+    return "OR".infix(terms)
+}
 public func ||(lhs: Expression<Bool>, rhs: Expression<Bool>) -> Expression<Bool> {
     return Operator.or.infix(lhs, rhs)
 }

Tests/SQLiteTests/OperatorsTests.swift

@@ -318,6 +318,16 @@ class OperatorsTests : XCTestCase {
         AssertSQL("(1 AND \"bool\")", true && bool)
         AssertSQL("(1 AND \"boolOptional\")", true && boolOptional)
     }
+    
+    func test_andFunction_withBooleanExpressions_buildsCompoundExpression() {
+        AssertSQL("(\"bool\" AND \"bool\" AND \"bool\")", and([bool, bool, bool]))
+        AssertSQL("(\"bool\" AND \"bool\")", and([bool, bool]))
+        AssertSQL("(\"bool\")", and([bool]))
+        
+        AssertSQL("(\"bool\" AND \"bool\" AND \"bool\")", and(bool, bool, bool))
+        AssertSQL("(\"bool\" AND \"bool\")", and(bool, bool))
+        AssertSQL("(\"bool\")", and(bool))
+    }
 
     func test_doubleOrOperator_withBooleanExpressions_buildsCompoundExpression() {
         AssertSQL("(\"bool\" OR \"bool\")", bool || bool)
@@ -329,6 +339,16 @@ class OperatorsTests : XCTestCase {
         AssertSQL("(1 OR \"bool\")", true || bool)
         AssertSQL("(1 OR \"boolOptional\")", true || boolOptional)
     }
+    
+    func test_orFunction_withBooleanExpressions_buildsCompoundExpression() {
+        AssertSQL("(\"bool\" OR \"bool\" OR \"bool\")", or([bool, bool, bool]))
+        AssertSQL("(\"bool\" OR \"bool\")", or([bool, bool]))
+        AssertSQL("(\"bool\")", or([bool]))
+        
+        AssertSQL("(\"bool\" OR \"bool\" OR \"bool\")", or(bool, bool, bool))
+        AssertSQL("(\"bool\" OR \"bool\")", or(bool, bool))
+        AssertSQL("(\"bool\")", or(bool))
+    }
 
     func test_unaryNotOperator_withBooleanExpressions_buildsNotExpression() {
         AssertSQL("NOT (\"bool\")", !bool)