WIP 2

Signed-off-by: Stephen Celis <stephen@stephencelis.com>

Author: stephencelis

SQLite.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 47;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -426,7 +426,7 @@
 				};
 			};
 			buildConfigurationList = DC2B29DC1B26F718001C60EA /* Build configuration list for PBXProject "SQLite" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 6.3";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -777,7 +777,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = "SQLite MacTests/Info.plist";
+				INFOPLIST_FILE = Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
@@ -792,7 +792,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = "SQLite MacTests/Info.plist";
+				INFOPLIST_FILE = Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;

SQLite.xcodeproj/xcshareddata/xcschemes/SQLite Mac.xcscheme

@@ -26,9 +26,29 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DC7253B41B52ADEC009B38B1"
+               BuildableName = "SQLite Mac Tests.xctest"
+               BlueprintName = "SQLite Mac Tests"
+               ReferencedContainer = "container:SQLite.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "DC7253AB1B52ADEB009B38B1"
+            BuildableName = "SQLite.framework"
+            BlueprintName = "SQLite Mac"
+            ReferencedContainer = "container:SQLite.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </TestAction>

Source/Core/Connection.swift

@@ -43,6 +43,8 @@ public final class Connection {
     public init(_ location: Location = .InMemory, readonly: Bool = false) throws {
         let flags = readonly ? SQLITE_OPEN_READONLY : SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE
         try check(sqlite3_open_v2(location.description, &handle, flags | SQLITE_OPEN_FULLMUTEX, nil))
+
+        dispatch_queue_set_specific(queue, Connection.queueKey, queueContext, nil)
     }
 
     // TODO: add 'Throws:' documentation here and so on
@@ -257,7 +259,7 @@ public final class Connection {
     ///     The transaction will be committed when the block returns. The block
     ///     must throw to roll the transaction back.
     // TODO: consider not requiring a throw to roll back?
-    public func transaction(mode: TransactionMode = .Deferred, @noescape block: () throws -> Void) throws {
+    public func transaction(mode: TransactionMode = .Deferred, block: () throws -> Void) throws {
         try transaction("BEGIN \(mode.rawValue) TRANSACTION", block, "COMMIT TRANSACTION", or: "ROLLBACK TRANSACTION")
     }
 
@@ -275,19 +277,24 @@ public final class Connection {
     ///     The block must throw to roll the savepoint back.
     // TODO: consider not requiring a throw to roll back?
     // TODO: consider removing ability to set a name?
-    public func savepoint(name: String = NSUUID().UUIDString, @noescape block: () throws -> Void) throws {
-        let savepoint = "SAVEPOINT \(name.quote())"
+    public func savepoint(name: String = NSUUID().UUIDString, block: () throws -> Void) throws {
+        let name = name.quote("'")
+        let savepoint = "SAVEPOINT \(name)"
+
         try transaction(savepoint, block, "RELEASE \(savepoint)", or: "ROLLBACK TO \(savepoint)")
     }
 
-    private func transaction(begin: String, @noescape _ block: () throws -> Void, _ commit: String, or rollback: String) throws {
-        try run(begin)
-        do {
-            try block()
-            try run(commit)
-        } catch {
-            try run(rollback)
-            throw error
+    // FIXME: rdar://problem/21389236
+    private func transaction(begin: String, _ block: () throws -> Void, _ commit: String, or rollback: String) throws {
+        return try sync {
+            try self.run(begin)
+            do {
+                try block()
+                try self.run(commit)
+            } catch {
+                try self.run(rollback)
+                throw error
+            }
         }
     }
 
@@ -478,8 +485,37 @@ public final class Connection {
         return resultCode
     }
 
+    func sync<T>(block: () throws -> T) rethrows -> T {
+        var success: T?
+        var failure: ErrorType?
+
+        let wrapped: () -> Void = {
+            do {
+                success = try block()
+            } catch {
+                failure = error
+            }
+        }
+
+        if dispatch_get_specific(Connection.queueKey) == queueContext {
+            wrapped()
+        } else {
+            dispatch_sync(queue, wrapped)
+        }
+
+        if let failure = failure {
+            try { () -> Void in throw failure }()
+        }
+
+        return success!
+    }
+
     private var queue = dispatch_queue_create("SQLite.Database", DISPATCH_QUEUE_SERIAL)
 
+    private static let queueKey = unsafeBitCast(Connection.self, UnsafePointer<Void>.self)
+
+    private lazy var queueContext: UnsafeMutablePointer<Void> = unsafeBitCast(self, UnsafeMutablePointer<Void>.self)
+
 }
 
 extension Connection : CustomStringConvertible {

Source/Extensions/FTS4.swift

@@ -15,6 +15,18 @@ extension Module {
 
 extension VirtualTable {
 
+    /// Builds an expression appended with a `MATCH` query against the given
+    /// pattern.
+    ///
+    ///     let emails = VirtualTable("emails")
+    ///
+    ///     emails.filter(emails.match("Hello"))
+    ///     // SELECT * FROM "emails" WHERE "emails" MATCH 'Hello'
+    ///
+    /// - Parameter pattern: A pattern to match.
+    ///
+    /// - Returns: An expression appended with a `MATCH` query against the given
+    ///   pattern.
     @warn_unused_result public func match(pattern: String) -> Expression<Bool> {
         return "MATCH".infix(tableName(), pattern)
     }
@@ -27,31 +39,77 @@ extension VirtualTable {
         return "MATCH".infix(tableName(), pattern)
     }
 
+    /// Builds a copy of the query with a `WHERE … MATCH` clause.
+    ///
+    ///     let emails = VirtualTable("emails")
+    ///
+    ///     emails.match("Hello")
+    ///     // SELECT * FROM "emails" WHERE "emails" MATCH 'Hello'
+    ///
+    /// - Parameter pattern: A pattern to match.
+    ///
+    /// - Returns: A query with the given `WHERE … MATCH` clause applied.
+    @warn_unused_result public func match(pattern: String) -> QueryType {
+        return filter(match(pattern))
+    }
+
+    @warn_unused_result public func match(pattern: Expression<String>) -> QueryType {
+        return filter(match(pattern))
+    }
+
+    @warn_unused_result public func match(pattern: Expression<String?>) -> QueryType {
+        return filter(match(pattern))
+    }
+
 }
 
-public enum Tokenizer {
+public struct Tokenizer {
 
-    internal static let moduleName = "SQLite.swift"
+    public static let Simple = Tokenizer("simple")
 
-    case Simple
+    public static let Porter = Tokenizer("porter")
 
-    case Porter
+    @warn_unused_result public static func Unicode61(removeDiacritics removeDiacritics: Bool? = nil, tokenchars: Set<Character> = [], separators: Set<Character> = []) -> Tokenizer {
+        var arguments = [String]()
 
-    case Custom(String)
+        if let removeDiacritics = removeDiacritics {
+            arguments.append("removeDiacritics=\(removeDiacritics ? 1 : 0)".quote())
+        }
+
+        if !tokenchars.isEmpty {
+            let joined = "".join(tokenchars.map { String($0) })
+            arguments.append("tokenchars=\(joined)".quote())
+        }
+
+        if !separators.isEmpty {
+            let joined = "".join(separators.map { String($0) })
+            arguments.append("separators=\(joined)".quote())
+        }
+
+        return Tokenizer("unicode61", arguments)
+    }
+
+    @warn_unused_result public static func Custom(name: String) -> Tokenizer {
+        return Tokenizer(Tokenizer.moduleName.quote(), [name.quote()])
+    }
+
+    public let name: String
+
+    public let arguments: [String]
+
+    private init(_ name: String, _ arguments: [String] = []) {
+        self.name = name
+        self.arguments = arguments
+    }
+
+    private static let moduleName = "SQLite.swift"
 
 }
 
-extension Tokenizer: CustomStringConvertible {
+extension Tokenizer : CustomStringConvertible {
 
     public var description: String {
-        switch self {
-        case .Simple:
-            return "simple"
-        case .Porter:
-            return "porter"
-        case .Custom(let tokenizer):
-            return " ".join([Tokenizer.moduleName.quote(), tokenizer.quote("'")])
-        }
+        return " ".join([name] + arguments)
     }
 
 }