allow numbers in literal/1

Author: greg-rychlewski

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

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

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

mix.exs

@@ -76,7 +76,7 @@ defmodule EctoSQL.MixProject do
     if path = System.get_env("ECTO_PATH") do
       {:ecto, path: path}
     else
-      {:ecto, github: "elixir-ecto/ecto"}
+      {:ecto, github: "greg-rychlewski/ecto", branch: "literal_numbers"}
     end
   end
 

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)

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)

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)