feat: enable return id flag for insert query (#118)

Kitura · Jan 26, 2018 · d74cff2 · d74cff2
1 parent fc4bbd0
commit d74cff2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/Sources/SwiftKuery/Insert.swift b/Sources/SwiftKuery/Insert.swift
@@ -36,14 +36,17 @@ public struct Insert: Query {
     /// An array of `AuxiliaryTable` which will be used in a query with a WITH clause.
     public private (set) var with: [AuxiliaryTable]?
 
+    /// A flag for return ID
+    public let returnID: Bool
+
     private var syntaxError = ""
 
     /// Initialize an instance of Insert.
     ///
     /// - Parameter into: The table to insert rows.
     /// - Parameter columns: An optional array of columns to insert. If nil, values of all the columns have to be provided.
     /// - Parameter values: An array containg the row to insert.
-    public init(into table: Table, columns: [Column]?, values: [Any]) {
+    public init(into table: Table, columns: [Column]?, values: [Any], returnID: Bool=false) {
         self.columns = columns
         var valuesToInsert = [[Any]]()
         valuesToInsert.append(values)
@@ -52,14 +55,15 @@ public struct Insert: Query {
         if let tableColumns = self.columns, tableColumns.count != values.count {
             syntaxError = "Values count doesn't match column count. "
         }
+        self.returnID = returnID
     }
 
     /// Initialize an instance of Insert.
     ///
     /// - Parameter into: The table to insert rows.
     /// - Parameter columns: An optional array of columns to insert. If not specified, values of all the columns have to be provided.
     /// - Parameter values: An array of rows (values to insert in each row).
-    public init(into table: Table, columns: [Column]?=nil, rows: [[Any]]) {
+    public init(into table: Table, columns: [Column]?=nil, rows: [[Any]], returnID: Bool=false) {
         self.columns = columns
         self.values = rows
         self.table = table
@@ -70,59 +74,61 @@ public struct Insert: Query {
                 }
             }
         }
+        self.returnID = returnID
     }
 
     /// Initialize an instance of Insert.
     ///
     /// - Parameter into: The table to insert rows.
     /// - Parameter values: A list of values (the row) to insert.
-    public init(into table: Table, values: Any...) {
-        self.init(into: table, columns: nil, values: values)
+    public init(into table: Table, values: Any..., returnID: Bool=false) {
+        self.init(into: table, columns: nil, values: values, returnID: returnID)
     }
 
     /// Initialize an instance of Insert.
     ///
     /// - Parameter into: The table to insert rows.
     /// - Parameter values: An array of values (the row) to insert.
-    public init(into table: Table, values: [Any]) {
-        self.init(into: table, columns: nil, values: values)
+    public init(into table: Table, values: [Any], returnID: Bool=false) {
+        self.init(into: table, columns: nil, values: values, returnID: returnID)
     }
 
     /// Initialize an instance of Insert.
     ///
     /// - Parameter into: The table to insert rows.
     /// - Parameter valueTuples: An array of (column, value) pairs to insert.
-    public init(into table: Table, valueTuples: [(Column, Any)]) {
+    public init(into table: Table, valueTuples: [(Column, Any)], returnID: Bool=false) {
         var columnsArray = Array<Column>()
         var valuesArray = Array<Any>()
         for (column, value) in valueTuples {
             columnsArray.append(column)
             valuesArray.append(value)
         }
-        self.init(into: table, columns: columnsArray, values: valuesArray)
+        self.init(into: table, columns: columnsArray, values: valuesArray, returnID: returnID)
     }
 
     /// Initialize an instance of Insert.
     ///
     /// - Parameter into: The table to insert rows.
     /// - Parameter valueTuples: A list of (column, value) pairs to insert.
-    public init(into table: Table, valueTuples: (Column, Any)...) {
-        self.init(into: table, valueTuples: valueTuples)
+    public init(into table: Table, valueTuples: (Column, Any)..., returnID: Bool=false) {
+        self.init(into: table, valueTuples: valueTuples, returnID: returnID)
     }
 
     /// Initialize an instance of Insert.
     ///
     /// - Parameter into: The table to insert rows.
     /// - Parameter columns: An optional array of columns to insert. If nil, values of all the columns have to be provided.
     /// - Parameter query: The select query that retrieves the rows to insert.
-    public init(into table: Table, columns: [Column]?=nil, _ query: Select) {
+    public init(into table: Table, columns: [Column]?=nil, _ query: Select, returnID: Bool=false) {
         self.columns = columns
         self.table = table
         self.query = query
         if let tableColumns = self.columns, let selectColumns = query.fields,
             tableColumns.count != selectColumns.count {
             syntaxError = "Number of columns in Select doesn't match column count. "
         }
+        self.returnID = returnID
     }
 
     /// Build the query using `QueryBuilder`.

diff --git a/Sources/SwiftKuery/Table.swift b/Sources/SwiftKuery/Table.swift
@@ -52,6 +52,7 @@ open class Table: Buildable {
                 _name = child.value as! String
             }
         }
+        /// TODO create function that implements this logic
         if columns.count == 0 {
             syntaxError += "No columns in the table. "
         }