introduce_identifier_constant

Author: greg-rychlewski

lib/ecto/adapters/myxql/connection.ex

@@ -750,6 +750,18 @@ if Code.ensure_loaded?(MyXQL) do
       quote_name(literal)
     end
 
+    defp expr({:identifier, _, [literal]}, _sources, _query) do
+      quote_name(literal)
+    end
+
+    defp expr({:constant, _, [literal]}, _sources, _query) when is_binary(literal) do
+      [?', escape_string(literal), ?']
+    end
+
+    defp expr({:constant, _, [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

@@ -991,6 +991,18 @@ if Code.ensure_loaded?(Postgrex) do
       quote_name(literal)
     end
 
+    defp expr({:identifier, _, [literal]}, _sources, _query) do
+      quote_name(literal)
+    end
+
+    defp expr({:constant, _, [literal]}, _sources, _query) when is_binary(literal) do
+      [?', escape_string(literal), ?']
+    end
+
+    defp expr({:constant, _, [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

@@ -830,6 +830,18 @@ if Code.ensure_loaded?(Tds) do
       quote_name(literal)
     end
 
+    defp expr({:identifier, _, [literal]}, _sources, _query) do
+      quote_name(literal)
+    end
+
+    defp expr({:constant, _, [literal]}, _sources, _query) when is_binary(literal) do
+      [?', escape_string(literal), ?']
+    end
+
+    defp expr({:constant, _, [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, git: "https://github.com/greg-rychlewski/ecto.git", branch: "literals_take_2"}
     end
   end
 

test/ecto/adapters/myxql_test.exs

@@ -658,6 +658,15 @@ 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], fragment("? COLLATE ?", r.x, identifier(^"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("?", constant(^1))) |> plan()
+    assert all(query) == ~s{SELECT s0.`x` FROM `schema` AS s0 LIMIT 1}
+
+    query = Schema |> select(fragment("?", constant(^"let's escape"))) |> plan()
+    assert all(query) == ~s{SELECT 'let''s escape' FROM `schema` AS s0}
+
     query =
       Schema
       |> select([r], r.x)

test/ecto/adapters/postgres_test.exs

@@ -838,6 +838,15 @@ 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], fragment("? COLLATE ?", r.x, identifier(^"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("?", constant(^1))) |> plan()
+    assert all(query) == ~s{SELECT s0."x" FROM "schema" AS s0 LIMIT 1}
+
+    query = Schema |> select(fragment("?", constant(^"let's escape"))) |> plan()
+    assert all(query) == ~s{SELECT 'let''s escape' FROM "schema" AS s0}
+
     query =
       Schema
       |> select([r], r.x)

test/ecto/adapters/tds_test.exs

@@ -694,6 +694,15 @@ 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], fragment("? COLLATE ?", r.x, identifier(^"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("?", constant(^1))) |> plan()
+    assert all(query) == ~s{SELECT TOP(1) s0.[x] FROM [schema] AS s0}
+
+    query = Schema |> select(fragment("?", constant(^"let's escape"))) |> plan()
+    assert all(query) == ~s{SELECT 'let''s escape' FROM [schema] AS s0}
+
     query =
       Schema
       |> select([r], r.x)