Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Allow numbers in literal/1 (#651)" and add support for identifier/1 and constant/1 #652

Merged
merged 5 commits into from
Jan 9, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
review comment from ecto
greg-rychlewski committed Jan 9, 2025
commit 003de81a9189e5e879c81ab700433876c5225ac3
4 changes: 0 additions & 4 deletions lib/ecto/adapters/myxql/connection.ex
Original file line number Diff line number Diff line change
@@ -746,10 +746,6 @@ if Code.ensure_loaded?(MyXQL) do
[?(, values_list(types, num_rows, query), ?)]
end

defp expr({:literal, _, [literal]}, _sources, _query) do
quote_name(literal)
end

defp expr({:identifier, _, [literal]}, _sources, _query) do
quote_name(literal)
end
4 changes: 0 additions & 4 deletions lib/ecto/adapters/postgres/connection.ex
Original file line number Diff line number Diff line change
@@ -987,10 +987,6 @@ if Code.ensure_loaded?(Postgrex) do
[?(, values_list(types, idx + 1, num_rows), ?)]
end

defp expr({:literal, _, [literal]}, _sources, _query) do
quote_name(literal)
end

defp expr({:identifier, _, [literal]}, _sources, _query) do
quote_name(literal)
end
4 changes: 0 additions & 4 deletions lib/ecto/adapters/tds/connection.ex
Original file line number Diff line number Diff line change
@@ -826,10 +826,6 @@ if Code.ensure_loaded?(Tds) do
[?(, values_list(types, idx + 1, num_rows), ?)]
end

defp expr({:literal, _, [literal]}, _sources, _query) do
quote_name(literal)
end

defp expr({:identifier, _, [literal]}, _sources, _query) do
quote_name(literal)
end
3 changes: 0 additions & 3 deletions test/ecto/adapters/myxql_test.exs
Original file line number Diff line number Diff line change
@@ -655,9 +655,6 @@ defmodule Ecto.Adapters.MyXQLTest do
query = Schema |> select([r], r.x) |> where([], fragment("? = \"query\\?\"", ^10)) |> plan()
assert all(query) == ~s{SELECT s0.`x` FROM `schema` AS s0 WHERE (? = \"query?\")}

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}

3 changes: 0 additions & 3 deletions test/ecto/adapters/postgres_test.exs
Original file line number Diff line number Diff line change
@@ -835,9 +835,6 @@ defmodule Ecto.Adapters.PostgresTest do
query = Schema |> select([r], fragment("downcase(?)", r.x)) |> plan()
assert all(query) == ~s{SELECT downcase(s0."x") FROM "schema" AS s0}

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}

3 changes: 0 additions & 3 deletions test/ecto/adapters/tds_test.exs
Original file line number Diff line number Diff line change
@@ -691,9 +691,6 @@ defmodule Ecto.Adapters.TdsTest do
query = Schema |> select([r], fragment("lower(?)", r.x)) |> plan()
assert all(query) == ~s{SELECT lower(s0.[x]) FROM [schema] AS s0}

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}