Remove replace(...) in favor of insert(or:...)

It's more flexible to expose all the ON CONFLICT actions.

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

Author: stephencelis

Documentation/Index.md

@@ -398,6 +398,9 @@ We can insert rows into a table by calling a [query’s](#queries) `insert` func
 ``` swift
 users.insert(email <- "alice@mac.com", name <- "Alice")?
 // INSERT INTO "users" ("email", "name") VALUES ('alice@mac.com', 'Alice')
+
+users.insert(or: .Replace, email <- "alice@mac.com", name <- "Alice B.")
+// INSERT OR REPLACE INTO "users" ("email", "name") VALUES ('alice@mac.com', 'Alice B.')
 ```
 
 The `insert` function can return several different types that are useful in different contexts.

SQLite Tests/QueryTests.swift

@@ -328,10 +328,10 @@ class QueryTests: SQLiteTestCase {
     }
 
     func test_replace_replaceRows() {
-        XCTAssertEqual(1, users.replace(email <- "alice@example.com", age <- 30).rowid!)
+        XCTAssertEqual(1, users.insert(or: .Replace, email <- "alice@example.com", age <- 30).rowid!)
         AssertSQL("INSERT OR REPLACE INTO \"users\" (\"email\", \"age\") VALUES ('alice@example.com', 30)")
 
-        XCTAssertEqual(1, users.replace(id <- 1, email <- "betty@example.com", age <- 30).rowid!)
+        XCTAssertEqual(1, users.insert(or: .Replace, id <- 1, email <- "betty@example.com", age <- 30).rowid!)
         AssertSQL("INSERT OR REPLACE INTO \"users\" (\"id\", \"email\", \"age\") VALUES (1, 'betty@example.com', 30)")
     }
 

SQLite/Query.swift

@@ -362,7 +362,7 @@ public struct Query {
 
     }
 
-    private func insertStatement(values: [Setter], or: OnConflict? = nil) -> Statement {
+    private func insertStatement(or: OnConflict? = nil, _ values: [Setter]) -> Statement {
         var insertClause = "INSERT"
         if let or = or { insertClause = "\(insertClause) OR \(or.rawValue)" }
         var expressions: [Expressible] = [Expression<()>(literal: "\(insertClause) INTO \(tableName.unaliased.SQL)")]
@@ -434,41 +434,55 @@ public struct Query {
 
     /// Runs an INSERT statement against the query.
     ///
-    /// :param: values A list of values to set.
+    /// :param: action An action to run in case of a conflict.
+    /// :param: value  A value to set.
+    /// :param: more   A list of additional values to set.
     ///
     /// :returns: The statement.
-    public func insert(value: Setter, _ more: Setter...) -> Statement { return insert([value] + more).statement }
+    public func insert(or action: OnConflict? = nil, _ value: Setter, _ more: Setter...) -> Statement {
+        return insert([value] + more).statement
+    }
 
     /// Runs an INSERT statement against the query.
     ///
-    /// :param: values A list of values to set.
+    /// :param: action An action to run in case of a conflict.
+    /// :param: value  A value to set.
+    /// :param: more   A list of additional values to set.
     ///
     /// :returns: The rowid.
-    public func insert(value: Setter, _ more: Setter...) -> Int64? { return insert([value] + more).rowid }
+    public func insert(or action: OnConflict? = nil, _ value: Setter, _ more: Setter...) -> Int64? {
+        return insert(or: action, [value] + more).rowid
+    }
 
     /// Runs an INSERT statement against the query.
     ///
-    /// :param: values A list of values to set.
+    /// :param: action An action to run in case of a conflict.
+    /// :param: value  A value to set.
+    /// :param: more   A list of additional values to set.
     ///
     /// :returns: The rowid and statement.
-    public func insert(value: Setter, _ more: Setter...) -> (rowid: Int64?, statement: Statement) {
-        return insert([value] + more)
+    public func insert(or action: OnConflict? = nil, _ value: Setter, _ more: Setter...) -> (rowid: Int64?, statement: Statement) {
+        return insert(or: action, [value] + more)
     }
 
     /// Runs an INSERT statement against the query.
     ///
+    /// :param: action An action to run in case of a conflict.
     /// :param: values An array of values to set.
     ///
     /// :returns: The rowid.
-    public func insert(values: [Setter]) -> Int64? { return insert(values).rowid }
+    public func insert(or action: OnConflict? = nil, _ values: [Setter]) -> Int64? {
+        return insert(or: action, values).rowid
+    }
 
     /// Runs an INSERT statement against the query.
     ///
+    /// :param: action An action to run in case of a conflict.
     /// :param: values An array of values to set.
     ///
     /// :returns: The rowid and statement.
-    public func insert(values: [Setter]) -> (rowid: Int64?, statement: Statement) {
-        let statement = insertStatement(values).run()
+    public func insert(or action: OnConflict? = nil, _ values: [Setter]) -> (rowid: Int64?, statement: Statement) {
+        let statement = insertStatement(or: action, values).run()
         return (statement.failed ? nil : database.lastInsertRowid, statement)
     }
 
@@ -491,46 +505,6 @@ public struct Query {
         return (statement.failed ? nil : database.lastInsertRowid, statement)
     }
 
-    /// Runs a REPLACE statement against the query.
-    ///
-    /// :param: values A list of values to set.
-    ///
-    /// :returns: The statement.
-    public func replace(values: Setter...) -> Statement { return replace(values).statement }
-
-    /// Runs a REPLACE statement against the query.
-    ///
-    /// :param: values A list of values to set.
-    ///
-    /// :returns: The rowid.
-    public func replace(values: Setter...) -> Int64? { return replace(values).rowid }
-
-    /// Runs a REPLACE statement against the query.
-    ///
-    /// :param: values A list of values to set.
-    ///
-    /// :returns: The rowid and statement.
-    public func replace(values: Setter...) -> (rowid: Int64?, statement: Statement) {
-        return replace(values)
-    }
-
-    /// Runs a REPLACE statement against the query.
-    ///
-    /// :param: values An array of values to set.
-    ///
-    /// :returns: The rowid.
-    public func replace(values: [Setter]) -> Int64? { return replace(values).rowid }
-
-    /// Runs a REPLACE statement against the query.
-    ///
-    /// :param: values An array of values to set.
-    ///
-    /// :returns: The rowid and statement.
-    public func replace(values: [Setter]) -> (rowid: Int64?, statement: Statement) {
-        let statement = insertStatement(values, or: .Replace).run()
-        return (statement.failed ? nil : database.lastInsertRowid, statement)
-    }
-
     /// Runs an UPDATE statement against the query.
     ///
     /// :param: values A list of values to set.