Change column config to .column(body, [.unindexed]) syntax

Author: jberkel

Documentation/Index.md

@@ -1407,7 +1407,7 @@ let subject = Expression<String>("subject")
 let body = Expression<String>("body")
 let config = FTS4Config()
     .column(subject)
-    .column(body, indexed: false)
+    .column(body, [.unindexed])
     .languageId("lid")
     .order(.Desc)
 

SQLite/Extensions/FTS4.swift

@@ -158,21 +158,21 @@ extension Connection {
 /// Configuration options shared between the [FTS4](https://www.sqlite.org/fts3.html) and
 /// [FTS5](https://www.sqlite.org/fts5.html) extensions.
 public class FTSConfig {
-    typealias ColumnDefinition = (Expressible, Bool)
+    public enum ColumnOption {
+        /// [The notindexed= option](https://www.sqlite.org/fts3.html#section_6_5)
+        case unindexed
+    }
+
+    typealias ColumnDefinition = (Expressible, options: [ColumnOption])
     var columnDefinitions = [ColumnDefinition]()
     var tokenizer: Tokenizer?
     var prefixes = [Int]()
     var externalContentSchema: SchemaType?
     var isContentless: Bool = false
 
-    /// Adds an indexed column definition
-    public func column(column: Expressible) -> Self {
-        return self.column(column, indexed: true)
-    }
-
     /// Adds a column definition
-    public func column(column: Expressible, indexed: Bool) -> Self {
-        self.columnDefinitions.append((column, indexed))
+    public func column(column: Expressible, _ options: [ColumnOption] = []) -> Self {
+        self.columnDefinitions.append((column, options))
         return self
     }
 
@@ -329,8 +329,8 @@ public class FTS4Config : FTSConfig {
 
     override func options() -> Options {
         var options = super.options()
-        for notIndexedColumn in (columnDefinitions.filter { !$0.1 }.map { $0.0 }) {
-            options.append("notindexed", value: notIndexedColumn)
+        for (column, _) in (columnDefinitions.filter { $0.options.contains(.unindexed) }) {
+            options.append("notindexed", value: column)
         }
         options.append("languageid", value: languageId)
         options.append("compress", value: compressFunction)

SQLite/Extensions/FTS5.swift

@@ -87,10 +87,10 @@ public class FTS5Config : FTSConfig {
 
     override func formatColumnDefinitions() -> [Expressible] {
         return columnDefinitions.map { definition in
-            if definition.1 {
-                return definition.0
-            } else {
+            if definition.options.contains(.unindexed) {
                 return " ".join([definition.0, Expression<Void>(literal: "UNINDEXED")])
+            } else {
+                return definition.0
             }
         }
     }

SQLiteTests/FTS4Tests.swift

@@ -73,7 +73,7 @@ class FTS4ConfigTests : XCTestCase {
     func test_config_unindexed_column() {
         XCTAssertEqual(
             "CREATE VIRTUAL TABLE \"virtual_table\" USING fts4(\"string\", notindexed=\"string\")",
-            sql(config.column(string, indexed: false)))
+            sql(config.column(string, [.unindexed])))
     }
 
     func test_external_content_view() {
@@ -160,8 +160,8 @@ class FTS4ConfigTests : XCTestCase {
             sql(config
                 .tokenizer(.Porter)
                 .column(int)
-                .column(string, indexed: false)
-                .column(date, indexed: false)
+                .column(string, [.unindexed])
+                .column(date, [.unindexed])
                 .externalContent(table)
                 .matchInfo(.FTS3)
                 .languageId("lid")

SQLiteTests/FTS5Tests.swift

@@ -30,7 +30,7 @@ class FTS5Tests: XCTestCase {
     func test_config_unindexed_column() {
         XCTAssertEqual(
             "CREATE VIRTUAL TABLE \"virtual_table\" USING fts5(\"string\" UNINDEXED)",
-            sql(config.column(string, indexed: false)))
+            sql(config.column(string, [.unindexed])))
     }
 
     func test_external_content_table() {
@@ -111,8 +111,8 @@ class FTS5Tests: XCTestCase {
             sql(config
                 .tokenizer(.Porter)
                 .column(int)
-                .column(string, indexed: false)
-                .column(date, indexed: false)
+                .column(string, [.unindexed])
+                .column(date, [.unindexed])
                 .externalContent(table)
                 .prefix([2, 4]))
         )