Add placeholder option to insert_all (#290)

Author: Un3qual

integration_test/myxql/test_helper.exs

@@ -97,7 +97,9 @@ excludes = [
   :add_column_if_not_exists,
   :remove_column_if_exists,
   # MySQL doesn't have a boolean type, so this ends up returning 0/1
-  :map_boolean_in_expression
+  :map_boolean_in_expression,
+  # MySQL doesn't support indexed parameters
+  :placeholders
 ]
 
 if Version.match?(version, ">= 8.0.0") do

lib/ecto/adapters/myxql.ex

@@ -259,7 +259,7 @@ defmodule Ecto.Adapters.MyXQL do
 
     key = primary_key!(schema_meta, returning)
     {fields, values} = :lists.unzip(params)
-    sql = @conn.insert(prefix, source, fields, [fields], on_conflict, [])
+    sql = @conn.insert(prefix, source, fields, [fields], on_conflict, [], [])
     opts = [{:cache_statement, "ecto_insert_#{source}"} | opts]
 
     case Ecto.Adapters.SQL.query(adapter_meta, sql, values ++ query_params, opts) do

lib/ecto/adapters/myxql/connection.ex

@@ -140,15 +140,18 @@ if Code.ensure_loaded?(MyXQL) do
     end
 
     @impl true
-    def insert(prefix, table, header, rows, on_conflict, []) do
+    def insert(prefix, table, header, rows, on_conflict, [], []) do
       fields = quote_names(header)
       ["INSERT INTO ", quote_table(prefix, table), " (", fields, ") VALUES ",
        insert_all(rows) | on_conflict(on_conflict, header)]
     end
-    def insert(_prefix, _table, _header, _rows, _on_conflict, _returning) do
+    def insert(_prefix, _table, _header, _rows, _on_conflict, _returning, []) do
       error!(nil, ":returning is not supported in insert/insert_all by MySQL")
     end
-
+    def insert(_prefix, _table, _header, _rows, _on_conflict, _returning, _placeholders) do
+      error!(nil, ":placeholders is not supported by MySQL")
+    end
+    
     defp on_conflict({_, _, [_ | _]}, _header) do
       error!(nil, "The :conflict_target option is not supported in insert/insert_all by MySQL")
     end

lib/ecto/adapters/postgres/connection.ex

@@ -152,12 +152,13 @@ if Code.ensure_loaded?(Postgrex) do
     end
 
     @impl true
-    def insert(prefix, table, header, rows, on_conflict, returning) do
+    def insert(prefix, table, header, rows, on_conflict, returning, placeholders) do
+      counter_offset = length(placeholders) + 1
       values =
         if header == [] do
           [" VALUES " | intersperse_map(rows, ?,, fn _ -> "(DEFAULT)" end)]
         else
-          [?\s, ?(, quote_names(header), ") VALUES " | insert_all(rows, 1)]
+          [?\s, ?(, quote_names(header), ") VALUES " | insert_all(rows, counter_offset)]
         end
 
       ["INSERT INTO ", quote_table(prefix, table), insert_as(on_conflict),
@@ -214,6 +215,9 @@ if Code.ensure_loaded?(Postgrex) do
         {%Ecto.Query{} = query, params_counter}, counter ->
           {[?(, all(query), ?)], counter + params_counter}
 
+        {:placeholder, placeholder_index}, counter ->
+          {[?$ | placeholder_index], counter}
+          
         _, counter ->
           {[?$ | Integer.to_string(counter)], counter + 1}
       end)

lib/ecto/adapters/sql.ex

@@ -140,15 +140,15 @@ defmodule Ecto.Adapters.SQL do
       def autogenerate(:binary_id), do: Ecto.UUID.bingenerate()
 
       @impl true
-      def insert_all(adapter_meta, schema_meta, header, rows, on_conflict, returning, opts) do
-        Ecto.Adapters.SQL.insert_all(adapter_meta, schema_meta, @conn, header, rows, on_conflict, returning, opts)
+      def insert_all(adapter_meta, schema_meta, header, rows, on_conflict, returning, placeholders, opts) do
+        Ecto.Adapters.SQL.insert_all(adapter_meta, schema_meta, @conn, header, rows, on_conflict, returning, placeholders, opts)
       end
 
       @impl true
       def insert(adapter_meta, %{source: source, prefix: prefix}, params,
                  {kind, conflict_params, _} = on_conflict, returning, opts) do
         {fields, values} = :lists.unzip(params)
-        sql = @conn.insert(prefix, source, fields, [fields], on_conflict, returning)
+        sql = @conn.insert(prefix, source, fields, [fields], on_conflict, returning, [])
         Ecto.Adapters.SQL.struct(adapter_meta, @conn, sql, :insert, source, [], values ++ conflict_params, kind, returning, opts)
       end
 
@@ -191,7 +191,7 @@ defmodule Ecto.Adapters.SQL do
         Ecto.Adapters.SQL.execute_ddl(meta, @conn, definition, opts)
       end
 
-      defoverridable [prepare: 2, execute: 5, insert: 6, update: 6, delete: 4, insert_all: 7,
+      defoverridable [prepare: 2, execute: 5, insert: 6, update: 6, delete: 4, insert_all: 8,
                       execute_ddl: 3, loaders: 2, dumpers: 2, autogenerate: 1,
                       ensure_all_started: 2, __before_compile__: 1]
     end
@@ -639,16 +639,18 @@ defmodule Ecto.Adapters.SQL do
   ## Query
 
   @doc false
-  def insert_all(adapter_meta, schema_meta, conn, header, rows, on_conflict, returning, opts) do
+  def insert_all(adapter_meta, schema_meta, conn, header, rows, on_conflict, returning, placeholders, opts) do
     %{source: source, prefix: prefix} = schema_meta
     {_, conflict_params, _} = on_conflict
     {rows, params} = unzip_inserts(header, rows)
-    sql = conn.insert(prefix, source, header, rows, on_conflict, returning)
+
+    sql = conn.insert(prefix, source, header, rows, on_conflict, returning, placeholders)
 
     opts = [{:cache_statement, "ecto_insert_all_#{source}"} | opts]
 
+    all_params = placeholders ++ Enum.reverse(params,  conflict_params)
     %{num_rows: num, rows: rows} =
-      query!(adapter_meta, sql, Enum.reverse(params) ++ conflict_params, opts)
+      query!(adapter_meta, sql, all_params, opts)
 
     {num, rows}
   end
@@ -658,10 +660,12 @@ defmodule Ecto.Adapters.SQL do
       Enum.map_reduce header, params, fn key, acc ->
         case :lists.keyfind(key, 1, fields) do
           {^key, {%Ecto.Query{} = query, query_params}} ->
-            {{query, length(query_params)}, Enum.reverse(query_params) ++ acc}
+            {{query, length(query_params)}, Enum.reverse(query_params, acc)}
+
+          {^key, {:placeholder, placeholder_index}} ->
+            {{:placeholder, Integer.to_string(placeholder_index)}, acc}
 
-          {^key, value} ->
-            {key, [value | acc]}
+          {^key, value} -> {key, [value | acc]}
 
           false -> {nil, acc}
         end

lib/ecto/adapters/sql/connection.ex

@@ -83,7 +83,8 @@ defmodule Ecto.Adapters.SQL.Connection do
   """
   @callback insert(prefix ::String.t, table :: String.t,
                    header :: [atom], rows :: [[atom | nil]],
-                   on_conflict :: Ecto.Adapter.Schema.on_conflict, returning :: [atom]) :: iodata
+                   on_conflict :: Ecto.Adapter.Schema.on_conflict, returning :: [atom],
+                   placeholders :: [term]) :: iodata
 
   @doc """
   Returns an UPDATE for the given `fields` in `table` filtered by

lib/ecto/adapters/tds/connection.ex

@@ -198,7 +198,8 @@ if Code.ensure_loaded?(Tds) do
     end
 
     @impl true
-    def insert(prefix, table, header, rows, on_conflict, returning) do
+    def insert(prefix, table, header, rows, on_conflict, returning, placeholders) do
+      counter_offset = length(placeholders) + 1
       [] = on_conflict(on_conflict, header)
       returning = returning(returning, "INSERTED")
 
@@ -212,7 +213,7 @@ if Code.ensure_loaded?(Tds) do
             quote_names(header),
             ?),
             returning,
-            " VALUES " | insert_all(rows, 1)
+            " VALUES " | insert_all(rows, counter_offset)
           ]
         end
 
@@ -243,6 +244,9 @@ if Code.ensure_loaded?(Tds) do
         {%Query{} = query, params_counter}, counter ->
           {[?(, all(query), ?)], counter + params_counter}
 
+        {:placeholder, placeholder_index}, counter ->
+          {[?@ | placeholder_index], counter}
+
         _, counter ->
           {[?@ | Integer.to_string(counter)], counter + 1}
       end)

mix.exs

@@ -77,7 +77,7 @@ defmodule EctoSQL.MixProject do
     if path = System.get_env("ECTO_PATH") do
       {:ecto, path: path}
     else
-      {:ecto, "~> 3.5.0"}
+      {:ecto, github: "elixir-ecto/ecto"}
     end
   end
 

mix.lock

@@ -7,7 +7,7 @@
   "deep_merge": {:hex, :deep_merge, "0.2.0", "c1050fa2edf4848b9f556fba1b75afc66608a4219659e3311d9c9427b5b680b3", [:mix], [], "hexpm", "e3bf435a54ed27b0ba3a01eb117ae017988804e136edcbe8a6a14c310daa966e"},
   "earmark": {:hex, :earmark, "1.4.4", "4821b8d05cda507189d51f2caeef370cf1e18ca5d7dfb7d31e9cafe6688106a4", [:mix], [], "hexpm", "1f93aba7340574847c0f609da787f0d79efcab51b044bb6e242cae5aca9d264d"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.10", "6603d7a603b9c18d3d20db69921527f82ef09990885ed7525003c7fe7dc86c56", [:mix], [], "hexpm", "8e2d5370b732385db2c9b22215c3f59c84ac7dda7ed7e544d7c459496ae519c0"},
-  "ecto": {:hex, :ecto, "3.5.2", "4e2c15b117a0e9918860cd1859bfa1791c587b78fca812bc8d373e0498d1f828", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "fd92cfb1e300dd8093e7607158760f734147dc9cc4a60743573e0ec137a7df11"},
+  "ecto": {:git, "https://github.com/un3qual/ecto.git", "b142dba16b6675e2870eeb96ab7ce4aa8635e924", [branch: "add_placeholders_initial"]},
   "ex_doc": {:hex, :ex_doc, "0.23.0", "a069bc9b0bf8efe323ecde8c0d62afc13d308b1fa3d228b65bca5cf8703a529d", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm", "f5e2c4702468b2fd11b10d39416ddadd2fcdd173ba2a0285ebd92c39827a5a16"},
   "jason": {:hex, :jason, "1.2.2", "ba43e3f2709fd1aa1dce90aaabfd039d000469c05c56f0b8e31978e03fa39052", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "18a228f5f0058ee183f29f9eae0805c6e59d61c3b006760668d8d18ff0d12179"},
   "makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"},

test/ecto/adapters/myxql_test.exs

@@ -54,7 +54,7 @@ defmodule Ecto.Adapters.MyXQLTest do
   defp execute_ddl(query), do: query |> SQL.execute_ddl |> Enum.map(&IO.iodata_to_binary/1)
 
   defp insert(prefx, table, header, rows, on_conflict, returning) do
-    IO.iodata_to_binary SQL.insert(prefx, table, header, rows, on_conflict, returning)
+    IO.iodata_to_binary SQL.insert(prefx, table, header, rows, on_conflict, returning, [])
   end
 
   defp update(prefx, table, fields, filter, returning) do