add public table name, add where not in query

Author: sergeymild

Sources/SQLite/Helpers.swift

@@ -88,11 +88,11 @@ extension String {
         return "\(self) ".wrap(expressions) as Expression<Void>
     }
 
-    func wrap<T>(_ expression: Expressible) -> Expression<T> {
+    public func wrap<T>(_ expression: Expressible) -> Expression<T> {
         return Expression("\(self)(\(expression.expression.template))", expression.expression.bindings)
     }
 
-    func wrap<T>(_ expressions: [Expressible]) -> Expression<T> {
+    public func wrap<T>(_ expressions: [Expressible]) -> Expression<T> {
         return wrap(", ".join(expressions))
     }
 

Sources/SQLite/Typed/CoreFunctions.swift

@@ -40,6 +40,7 @@ private enum Function: String {
     case substr
     case like = "LIKE"
     case `in` = "IN"
+    case notIn = "NOT IN"
     case glob = "GLOB"
     case match = "MATCH"
     case regexp = "REGEXP"
@@ -704,6 +705,38 @@ extension Collection where Iterator.Element : Value {
         let templates = [String](repeating: "?", count: count).joined(separator: ", ")
         return Function.in.infix(expression, Expression<Void>("(\(templates))", map { $0.datatypeValue }))
     }
+    
+    /// Builds a copy of the expression prepended with an `NOT IN` check against the
+    /// collection.
+    ///
+    ///     let name = Expression<String>("name")
+    ///     ["alice", "betty"].containsNot(name)
+    ///     // "name" NOT IN ('alice', 'betty')
+    ///
+    /// - Parameter pattern: A pattern to match.
+    ///
+    /// - Returns: A copy of the expression prepended with an `NOT IN` check against
+    ///   the collection.
+    public func containsNot(_ expression: Expression<Iterator.Element>) -> Expression<Bool> {
+        let templates = [String](repeating: "?", count: count).joined(separator: ", ")
+        return Function.notIn.infix(expression, Expression<Void>("(\(templates))", map { $0.datatypeValue }))
+    }
+    
+    /// Builds a copy of the expression prepended with an `NOT IN` check against the
+    /// collection.
+    ///
+    ///     let name = Expression<String>("name")
+    ///     ["alice", "betty"].containsNot(name)
+    ///     // "name" NOT IN ('alice', 'betty')
+    ///
+    /// - Parameter pattern: A pattern to match.
+    ///
+    /// - Returns: A copy of the expression prepended with an `NOT IN` check against
+    ///   the collection.
+    public func containsNot(_ expression: Expression<Iterator.Element?>) -> Expression<Bool?> {
+        let templates = [String](repeating: "?", count: count).joined(separator: ", ")
+        return Function.notIn.infix(expression, Expression<Void>("(\(templates))", map { $0.datatypeValue }))
+    }
 
 }
 

Sources/SQLite/Typed/Query.swift

@@ -801,10 +801,12 @@ extension QueryType {
 public struct Table : SchemaType {
 
     public static let identifier = "TABLE"
+    public let name: String
 
     public var clauses: QueryClauses
 
     public init(_ name: String, database: String? = nil) {
+        self.name = name
         clauses = QueryClauses(name, alias: nil, database: database)
     }
 

Tests/SQLiteTests/CoreFunctionsTests.swift

@@ -141,5 +141,10 @@ class CoreFunctionsTests : XCTestCase {
         AssertSQL("(\"string\" IN ('hello', 'world'))", ["hello", "world"].contains(string))
         AssertSQL("(\"stringOptional\" IN ('hello', 'world'))", ["hello", "world"].contains(stringOptional))
     }
+    
+    func test_contains_buildsExpressionWithNotInOperator() {
+        AssertSQL("(\"string\" NOT IN ('hello', 'world'))", ["hello", "world"].containsNot(string))
+        AssertSQL("(\"stringOptional\" NOT IN ('hello', 'world'))", ["hello", "world"].containsNot(stringOptional))
+    }
 
 }