wip #811

Author: leafo

lapis/db/base_model.lua

@@ -1116,7 +1116,21 @@ do
       end
     end
     local res
-    if returning then
+    if opts and opts.on_conflict then
+      local insert_opts = {
+        on_conflict = opts.on_conflict
+      }
+      if return_all then
+        insert_opts.returning = "*"
+      elseif returning then
+        insert_opts.returning = returning
+      else
+        insert_opts.returning = {
+          self:primary_keys()
+        }
+      end
+      res = self.db.insert(self:table_name(), values, insert_opts)
+    elseif returning then
       res = self.db.insert(self:table_name(), values, unpack(returning))
     else
       res = self.db.insert(self:table_name(), values, self:primary_keys())

lapis/db/base_model.moon

@@ -590,7 +590,17 @@ class BaseModel
         returning or= {@primary_keys!}
         table.insert returning, k
 
-    res = if returning
+    res = if opts and opts.on_conflict
+      -- use options table API when on_conflict is specified
+      insert_opts = { on_conflict: opts.on_conflict }
+      if return_all
+        insert_opts.returning = "*"
+      elseif returning
+        insert_opts.returning = returning
+      else
+        insert_opts.returning = { @primary_keys! }
+      @db.insert @table_name!, values, insert_opts
+    elseif returning
       @db.insert @table_name!, values, unpack returning
     else
       @db.insert @table_name!, values, @primary_keys!

spec/model_spec.moon

@@ -424,6 +424,57 @@ describe "lapis.db.model", ->
       id: 101
     }, row1
 
+  it "should create model with on_conflict do_nothing", ->
+    mock_query "INSERT", { { id: 101 } }
+
+    class Things extends Model
+
+    thing = Things\create { color: "blue" }, on_conflict: "do_nothing"
+
+    assert.same { id: 101, color: "blue" }, thing
+
+    assert_queries {
+      [[INSERT INTO "things" ("color") VALUES ('blue') ON CONFLICT DO NOTHING RETURNING "id"]]
+    }
+
+  it "should create model with on_conflict and returning", ->
+    mock_query "INSERT", { { id: 101, height: 55 } }
+
+    class Things extends Model
+
+    thing = Things\create { color: "blue" }, on_conflict: "do_nothing", returning: { "height" }
+
+    assert.same { id: 101, color: "blue", height: 55 }, thing
+
+    assert_queries {
+      [[INSERT INTO "things" ("color") VALUES ('blue') ON CONFLICT DO NOTHING RETURNING "id", "height"]]
+    }
+
+  it "should create model with on_conflict and returning *", ->
+    mock_query "INSERT", { { id: 101, color: "gotya", other: "field" } }
+
+    class Things extends Model
+
+    thing = Things\create { color: "blue" }, on_conflict: "do_nothing", returning: "*"
+
+    assert.same { id: 101, color: "gotya", other: "field" }, thing
+
+    assert_queries {
+      [[INSERT INTO "things" ("color") VALUES ('blue') ON CONFLICT DO NOTHING RETURNING *]]
+    }
+
+  it "should create timed model with on_conflict", ->
+    mock_query "INSERT", { { id: 101 } }
+
+    class TimedThings extends Model
+      @timestamp: true
+
+    thing = TimedThings\create { color: "blue" }, on_conflict: "do_nothing"
+
+    assert_queries {
+      [[INSERT INTO "timed_things" ("color", "created_at", "updated_at") VALUES ('blue', '2013-08-13 06:56:40', '2013-08-13 06:56:40') ON CONFLICT DO NOTHING RETURNING "id"]]
+    }
+
   it "should refresh model", ->
     class Things extends Model
     mock_query "SELECT", { { id: 123 } }

spec/sqlite_spec.moon

@@ -654,6 +654,58 @@ describe "lapis.db.sqlite", ->
         [[INSERT INTO "my_names" ("created_at", "name", "updated_at") VALUES ('2023-02-10 21:27:00', 'Nanette' || 2, '2023-02-10 21:27:00') RETURNING *]]
       }, query_log
 
+    it "Model:create with on_conflict do_nothing", ->
+      -- First insert should succeed
+      m1 = MyNames\create {
+        name: "First"
+      }
+
+      assert.same 1, m1.id
+
+      -- Create a unique index on name for conflict testing
+      schema.create_index "my_names", "name", unique: true
+
+      -- Second insert with same name should be ignored
+      m2 = MyNames\create {
+        name: "First"
+      }, on_conflict: "do_nothing"
+
+      -- Values come from input
+      assert.same "First", m2.name
+
+      -- Only one row should exist
+      assert.same 1, MyNames\count!
+
+      assert.same {
+        [[INSERT INTO "my_names" ("created_at", "name", "updated_at") VALUES ('2023-02-10 21:27:00', 'First', '2023-02-10 21:27:00') RETURNING "id"]]
+        [[CREATE UNIQUE INDEX "my_names_name_idx" ON "my_names" ("name")]]
+        [[INSERT INTO "my_names" ("created_at", "name", "updated_at") VALUES ('2023-02-10 21:27:00', 'First', '2023-02-10 21:27:00') ON CONFLICT DO NOTHING RETURNING "id"]]
+        [[SELECT COUNT(*) AS c FROM "my_names" ]]
+      }, query_log
+
+    it "Model:create with on_conflict and returning *", ->
+      -- First insert
+      m1 = MyNames\create {
+        name: "Test"
+      }
+
+      schema.create_index "my_names", "name", unique: true
+
+      -- Conflicting insert with returning *
+      m2 = MyNames\create {
+        name: "Test"
+      }, on_conflict: "do_nothing", returning: "*"
+
+      -- Only one row should exist
+      assert.same 1, MyNames\count!
+
+      assert.same {
+        [[INSERT INTO "my_names" ("created_at", "name", "updated_at") VALUES ('2023-02-10 21:27:00', 'Test', '2023-02-10 21:27:00') RETURNING "id"]]
+        [[CREATE UNIQUE INDEX "my_names_name_idx" ON "my_names" ("name")]]
+        [[INSERT INTO "my_names" ("created_at", "name", "updated_at") VALUES ('2023-02-10 21:27:00', 'Test', '2023-02-10 21:27:00') ON CONFLICT DO NOTHING RETURNING *]]
+        [[SELECT COUNT(*) AS c FROM "my_names" ]]
+      }, query_log
+
     it "Model:update", ->
       -- handles when model no longer has record
       missing = MyNames\load { id: 99, name: "CowCat" }

spec_postgres/model_spec.moon

@@ -277,6 +277,79 @@ describe "lapis.db.model", ->
       post\update user_id: db.raw "(case when false then 1234 else null end)"
       assert.same nil, post.user_id
 
+  describe "on_conflict", ->
+    it "creates with on_conflict do_nothing", ->
+      Likes\create_table!
+      -- First insert should succeed
+      like1 = Likes\create {
+        user_id: 1
+        post_id: 1
+        count: 5
+      }
+
+      assert.same 1, like1.user_id
+      assert.same 1, like1.post_id
+      assert.same 5, like1.count
+
+      -- Second insert with same primary key should be ignored
+      like2 = Likes\create {
+        user_id: 1
+        post_id: 1
+        count: 99
+      }, on_conflict: "do_nothing"
+
+      -- When conflict occurs, the returned object has the input values
+      -- but nothing was actually inserted
+      assert.same 1, like2.user_id
+      assert.same 1, like2.post_id
+      assert.same 99, like2.count
+
+      -- Verify only one row exists with original count
+      assert.same 1, Likes\count!
+      original = Likes\find 1, 1
+      assert.same 5, original.count
+
+    it "creates with on_conflict and returning *", ->
+      Likes\create_table!
+      -- First insert
+      Likes\create {
+        user_id: 1
+        post_id: 1
+        count: 5
+      }
+
+      -- Conflicting insert with returning * - should return nothing when conflict
+      like2 = Likes\create {
+        user_id: 1
+        post_id: 1
+        count: 99
+      }, on_conflict: "do_nothing", returning: "*"
+
+      -- Values come from input since RETURNING gives nothing on conflict
+      assert.same 1, like2.user_id
+      assert.same 1, like2.post_id
+
+      -- Verify only one row exists
+      assert.same 1, Likes\count!
+
+    it "creates successfully with on_conflict when no conflict", ->
+      Likes\create_table!
+      -- Insert with on_conflict should work normally when no conflict
+      like = Likes\create {
+        user_id: 1
+        post_id: 1
+        count: 10
+      }, on_conflict: "do_nothing"
+
+      assert.same 1, like.user_id
+      assert.same 1, like.post_id
+      assert.same 10, like.count
+
+      -- Verify row was inserted
+      assert.same 1, Likes\count!
+      found = Likes\find 1, 1
+      assert.same 10, found.count
+
   describe "delete", ->
     before_each ->
       Posts\create_table!