diff --git a/lib/ecto/adapters/myxql/connection.ex b/lib/ecto/adapters/myxql/connection.ex index 980561ac..af4bd0cf 100644 --- a/lib/ecto/adapters/myxql/connection.ex +++ b/lib/ecto/adapters/myxql/connection.ex @@ -746,10 +746,14 @@ if Code.ensure_loaded?(MyXQL) do [?(, values_list(types, num_rows, query), ?)] end - defp expr({:literal, _, [literal]}, _sources, _query) do + defp expr({:literal, _, [literal]}, _sources, _query) when is_binary(literal) do quote_name(literal) end + defp expr({:literal, _, [literal]}, _sources, _query) when is_number(literal) do + [to_string(literal)] + end + defp expr({:splice, _, [{:^, _, [_, length]}]}, _sources, _query) do Enum.intersperse(List.duplicate(??, length), ?,) end diff --git a/lib/ecto/adapters/postgres/connection.ex b/lib/ecto/adapters/postgres/connection.ex index c583239f..bbce337f 100644 --- a/lib/ecto/adapters/postgres/connection.ex +++ b/lib/ecto/adapters/postgres/connection.ex @@ -987,10 +987,14 @@ if Code.ensure_loaded?(Postgrex) do [?(, values_list(types, idx + 1, num_rows), ?)] end - defp expr({:literal, _, [literal]}, _sources, _query) do + defp expr({:literal, _, [literal]}, _sources, _query) when is_binary(literal) do quote_name(literal) end + defp expr({:literal, _, [literal]}, _sources, _query) when is_number(literal) do + [to_string(literal)] + end + defp expr({:splice, _, [{:^, _, [idx, length]}]}, _sources, _query) do Enum.map_join(1..length, ",", &"$#{idx + &1}") end diff --git a/lib/ecto/adapters/tds/connection.ex b/lib/ecto/adapters/tds/connection.ex index 8d1e0e9a..1f4a4555 100644 --- a/lib/ecto/adapters/tds/connection.ex +++ b/lib/ecto/adapters/tds/connection.ex @@ -826,10 +826,14 @@ if Code.ensure_loaded?(Tds) do [?(, values_list(types, idx + 1, num_rows), ?)] end - defp expr({:literal, _, [literal]}, _sources, _query) do + defp expr({:literal, _, [literal]}, _sources, _query) when is_binary(literal) do quote_name(literal) end + defp expr({:literal, _, [literal]}, _sources, _query) when is_number(literal) do + [to_string(literal)] + end + defp expr({:splice, _, [{:^, _, [idx, length]}]}, _sources, _query) do list_param_to_args(idx, length) end diff --git a/mix.lock b/mix.lock index 19e478f4..c2e00011 100644 --- a/mix.lock +++ b/mix.lock @@ -4,7 +4,7 @@ "decimal": {:hex, :decimal, "2.3.0", "3ad6255aa77b4a3c4f818171b12d237500e63525c2fd056699967a3e7ea20f62", [:mix], [], "hexpm", "a4d66355cb29cb47c3cf30e71329e58361cfcb37c34235ef3bf1d7bf3773aeac"}, "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"}, "earmark_parser": {:hex, :earmark_parser, "1.4.41", "ab34711c9dc6212dda44fcd20ecb87ac3f3fce6f0ca2f28d4a00e4154f8cd599", [:mix], [], "hexpm", "a81a04c7e34b6617c2792e291b5a2e57ab316365c2644ddc553bb9ed863ebefa"}, - "ecto": {:git, "https://github.com/elixir-ecto/ecto.git", "4990abda4c504133f89deed469582785166208f5", []}, + "ecto": {:git, "https://github.com/elixir-ecto/ecto.git", "3ab8279b574b0162372c838441ce9ec1772a71e1", []}, "ex_doc": {:hex, :ex_doc, "0.34.2", "13eedf3844ccdce25cfd837b99bea9ad92c4e511233199440488d217c92571e8", [:mix], [{:earmark_parser, "~> 1.4.39", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "5ce5f16b41208a50106afed3de6a2ed34f4acfd65715b82a0b84b49d995f95c1"}, "jason": {:hex, :jason, "1.4.4", "b9226785a9aa77b6857ca22832cffa5d5011a667207eb2a0ad56adb5db443b8a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"}, "makeup": {:hex, :makeup, "1.1.2", "9ba8837913bdf757787e71c1581c21f9d2455f4dd04cfca785c70bbfff1a76a3", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cce1566b81fbcbd21eca8ffe808f33b221f9eee2cbc7a1706fc3da9ff18e6cac"}, diff --git a/test/ecto/adapters/myxql_test.exs b/test/ecto/adapters/myxql_test.exs index 1d0e9c0f..8f415962 100644 --- a/test/ecto/adapters/myxql_test.exs +++ b/test/ecto/adapters/myxql_test.exs @@ -658,6 +658,9 @@ defmodule Ecto.Adapters.MyXQLTest do query = Schema |> select([r], fragment("? COLLATE ?", r.x, literal(^"es_ES"))) |> plan() assert all(query) == ~s{SELECT s0.`x` COLLATE `es_ES` FROM `schema` AS s0} + query = Schema |> select([r], r.x) |> limit(fragment("?", literal(^1))) |> plan() + assert all(query) == ~s{SELECT s0.`x` FROM `schema` AS s0 LIMIT 1} + query = Schema |> select([r], r.x) diff --git a/test/ecto/adapters/postgres_test.exs b/test/ecto/adapters/postgres_test.exs index f37b6786..f82c9813 100644 --- a/test/ecto/adapters/postgres_test.exs +++ b/test/ecto/adapters/postgres_test.exs @@ -838,6 +838,9 @@ defmodule Ecto.Adapters.PostgresTest do query = Schema |> select([r], fragment("? COLLATE ?", r.x, literal(^"es_ES"))) |> plan() assert all(query) == ~s{SELECT s0."x" COLLATE "es_ES" FROM "schema" AS s0} + query = Schema |> select([r], r.x) |> limit(fragment("?", literal(^1))) |> plan() + assert all(query) == ~s{SELECT s0."x" FROM "schema" AS s0 LIMIT 1} + query = Schema |> select([r], r.x) diff --git a/test/ecto/adapters/tds_test.exs b/test/ecto/adapters/tds_test.exs index a3563267..7a373f9b 100644 --- a/test/ecto/adapters/tds_test.exs +++ b/test/ecto/adapters/tds_test.exs @@ -694,6 +694,9 @@ defmodule Ecto.Adapters.TdsTest do query = Schema |> select([r], fragment("? COLLATE ?", r.x, literal(^"es_ES"))) |> plan() assert all(query) == ~s{SELECT s0.[x] COLLATE [es_ES] FROM [schema] AS s0} + query = Schema |> select([r], r.x) |> limit(fragment("?", literal(^1))) |> plan() + assert all(query) == ~s{SELECT TOP(1) s0.[x] FROM [schema] AS s0} + query = Schema |> select([r], r.x)