Fix upsert

Author: jgaskins

spec/interro_spec.cr

@@ -106,6 +106,13 @@ struct UserQuery < Interro::QueryBuilder(User)
     insert! email: email, name: name
   end
 
+  def upsert(email : String, name : String)
+    data = {email: email, name: name}
+    insert data,
+      on_conflict: Interro::ConflictHandler.new "email",
+        do: Interro::Update.new(set: {name: name, updated_at: Time.utc})
+  end
+
   def destroy(user : User)
     self
       .where(id: user.id)
@@ -362,6 +369,15 @@ describe Interro do
       user.name.should eq "Foo"
     end
 
+    it "can upsert a row" do
+      email = "foo-#{UUID.random}@example.com"
+      user = UserQuery.new.create(email: email, name: "Foo")
+
+      upserted = UserQuery.new.upsert(email: email, name: "Bar")
+
+      UserQuery.new.find!(id: user.id).name.should eq "Bar"
+    end
+
     it "can find a row" do
       email = "finduser-#{UUID.random}@example.com"
       created_user = UserQuery.new.create(email: email, name: "Find User")

src/interro.cr

@@ -44,7 +44,7 @@ module Interro
         .values
         .map { |value| Interro::Any.new(value) }
         .to_a
-      sql = generate_query query.sql_table_name, params,
+      sql = generate_query query.sql_table_name, params, args,
         on_conflict: conflict_handler,
         returning: ->(io : IO) { query.select_columns io }
 
@@ -57,7 +57,7 @@ module Interro
         .values
         .map { |value| Interro::Any.new(value) }
         .to_a
-      sql = generate_query query.sql_table_name, params,
+      sql = generate_query query.sql_table_name, params, args,
         on_conflict: conflict_handler,
         returning: nil
 
@@ -67,6 +67,7 @@ module Interro
     protected def generate_query(
       table_name : String,
       params,
+      args,
       on_conflict conflict_handler : ConflictHandler?,
       returning returning_clause,
     )

src/types.cr

@@ -13,7 +13,7 @@ module Interro
 
   record Any, value : Value do
     def self.new(values : Array)
-      new values.map { |value| Any.new(value) }
+      new values.map { |value| new(value) }
     end
 
     def self.new(any : self)