PRIMARY KEY cleanup

Let's enable defaults for primary keys, and let's not bother with a
uniqueness parameter, since it's implied.

Signed-off-by: Stephen Celis <[email protected]>

Author: stephencelis

Documentation/Index.md

@@ -282,7 +282,7 @@ The `create(table:)` function has several default parameters we can override.
 
 The `column` function is used for a single column definition. It takes an [expression](#expressions) describing the column name and type, and accepts several parameters that map to various column constraints and clauses.
 
-  - `primaryKey` adds an `INTEGER PRIMARY KEY` constraint to a single column. (See the `primaryKey` function under [Table Constraints](#table-constraints) for non-integer primary keys).
+  - `primaryKey` adds a `PRIMARY KEY` constraint to a single column.
 
     ``` swift
     t.column(id, primaryKey: true)
@@ -292,9 +292,11 @@ The `column` function is used for a single column definition. It takes an [expre
     // "id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL
     ```
 
-    > _Note:_ The `primaryKey` parameter cannot be used alongside `defaultValue` or `references`. If you need to create a column that has a default value and is also a primary and/or foreign key, use the `primaryKey` and `foreignKey` functions mentioned under [Table Constraints](#table-constraints).
+    > _Note:_ The `primaryKey` parameter cannot be used alongside `references`. If you need to create a column that has a default value and is also a primary and/or foreign key, use the `primaryKey` and `foreignKey` functions mentioned under [Table Constraints](#table-constraints).
     >
-    > Primary keys cannot be optional (`Expression<Int64?>`).
+    > Primary keys cannot be optional (_e.g._, `Expression<Int64?>`).
+    >
+    > Only an `INTEGER PRIMARY KEY` can take `.Autoincrement`.
 
   - `unique` adds a `UNIQUE` constraint to the column. (See the `unique` function under [Table Constraints](#table-constraints) for uniqueness over multiple columns).
 

SQLite Tests/SchemaTests.swift

@@ -7,7 +7,6 @@ private let age = Expression<Int?>("age")
 private let salary = Expression<Double>("salary")
 private let admin = Expression<Bool>("admin")
 private let manager_id = Expression<Int64?>("manager_id")
-private let uniqueIdentifier = Expression<UniqueIdentifier>("uniqueIdentifier")
 
 class SchemaTests: XCTestCase {
 
@@ -48,13 +47,22 @@ class SchemaTests: XCTestCase {
 
     func test_createTable_column_nonIntegerPrimaryKey() {
         ExpectExecution(db, "CREATE TABLE \"users\" (\"email\" TEXT PRIMARY KEY NOT NULL)",
-            db.create(table: users) { $0.column(email, primaryKey: true) }
+            db.create(table: users) { t in
+                t.column(email, primaryKey: true)
+            }
         )
     }
-    
-    func test_createTable_column_customTypePrimaryKey() {
-        ExpectExecution(db, "CREATE TABLE \"users\" (\"uniqueIdentifier\" TEXT PRIMARY KEY NOT NULL)",
-            db.create(table: users) { $0.column(uniqueIdentifier, primaryKey: true) }
+
+    func test_createTable_column_nonIntegerPrimaryKey_withDefaultValue() {
+        let uuid = Expression<String>("uuid")
+        let uuidgen: () -> Expression<String> = db.create(function: "uuidgen") {
+            return NSUUID().UUIDString
+        }
+
+        ExpectExecution(db, "CREATE TABLE \"users\" (\"uuid\" TEXT PRIMARY KEY NOT NULL DEFAULT (\"uuidgen\"()))",
+            db.create(table: users) { t in
+                t.column(uuid, primaryKey: true, defaultValue: uuidgen())
+            }
         )
     }
 

SQLite Tests/TestHelper.swift

@@ -55,16 +55,3 @@ func ExpectExecution(db: Database, SQL: String, statement: @autoclosure () -> St
 func ExpectExecution(db: Database, SQL: String, query: Query) {
     ExpectExecutions(db, [SQL: 1]) { _ in for _ in query {} }
 }
-
-
-public class UniqueIdentifier : NSUUID, Value {
-    public class var declaredDatatype:String { get { return "TEXT" } }
-    
-    public class func fromDatatypeValue(datatypeValue: String) -> UniqueIdentifier {
-        return UniqueIdentifier(UUIDString: datatypeValue)!
-    }
-    
-    public var datatypeValue: String {
-        return self.UUIDString
-    }
-}

SQLite/Schema.swift

@@ -164,7 +164,7 @@ public final class SchemaBuilder {
         check: Expression<Bool>? = nil,
         defaultValue value: Expression<V>?
     ) {
-        column(name, nil, false, unique, check, value)
+        column(name, nil, false, unique, check, value.map { wrap("", $0) })
     }
 
     public func column<V: Value>(
@@ -182,7 +182,7 @@ public final class SchemaBuilder {
         check: Expression<Bool>? = nil,
         defaultValue value: Expression<V>?
     ) {
-        column(Expression<V>(name), nil, true, unique, check, value)
+        column(Expression<V>(name), nil, true, unique, check, value.map { wrap("", $0) })
     }
 
     public func column<V: Value>(
@@ -197,10 +197,10 @@ public final class SchemaBuilder {
     public func column<V: Value>(
         name: Expression<V>,
         primaryKey: Bool,
-        unique: Bool = false,
-        check: Expression<Bool>? = nil
+        check: Expression<Bool>? = nil,
+        defaultValue value: Expression<V>? = nil
     ) {
-        column(name, primaryKey ? .Default : nil, false, unique, check, nil, nil)
+        column(name, primaryKey ? .Default : nil, false, false, check, value.map { wrap("", $0) }, nil)
     }
 
     // MARK: - INTEGER Columns
@@ -218,10 +218,9 @@ public final class SchemaBuilder {
     public func column<V: Value where V.Datatype == Int64>(
         name: Expression<V>,
         primaryKey: PrimaryKey?,
-        unique: Bool = false,
         check: Expression<Bool>? = nil
     ) {
-        column(name, primaryKey, false, unique, check, nil, nil)
+        column(name, primaryKey, false, false, check, nil, nil)
     }
 
     // MARK: REFERENCES