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.

Sign up for GitHub

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

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e000147
Revert "Allow numbers in `literal/1` (#651)"
greg-rychlewski Jan 9, 2025
93d8c68
introduce_identifier_constant
greg-rychlewski Jan 9, 2025
6486675
point to ecto pr
greg-rychlewski Jan 9, 2025
003de81
review comment from ecto
greg-rychlewski Jan 9, 2025
8298e84
point to ecto repo
greg-rychlewski Jan 9, 2025
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
12 changes: 10 additions & 2 deletions lib/ecto/adapters/myxql/connection.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,11 +746,19 @@ if Code.ensure_loaded?(MyXQL) do
[?(, values_list(types, num_rows, query), ?)]
end

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

defp expr({:literal, _, [literal]}, _sources, _query) when is_number(literal) do
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

Expand Down
12 changes: 10 additions & 2 deletions lib/ecto/adapters/postgres/connection.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,11 +987,19 @@ if Code.ensure_loaded?(Postgrex) do
[?(, values_list(types, idx + 1, num_rows), ?)]
end

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

defp expr({:literal, _, [literal]}, _sources, _query) when is_number(literal) do
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

Expand Down
12 changes: 10 additions & 2 deletions lib/ecto/adapters/tds/connection.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,11 +826,19 @@ if Code.ensure_loaded?(Tds) do
[?(, values_list(types, idx + 1, num_rows), ?)]
end

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

defp expr({:literal, _, [literal]}, _sources, _query) when is_number(literal) do
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

Expand Down
2 changes: 1 addition & 1 deletion mix.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion mix.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", "3ab8279b574b0162372c838441ce9ec1772a71e1", []},
"ecto": {:git, "https://github.com/greg-rychlewski/ecto.git", "c161ae3a4c6d0ed55ea7d076bc672b1a301546db", [branch: "literals_take_2"]},
"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"},
Expand Down
8 changes: 7 additions & 1 deletion test/ecto/adapters/myxql_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,9 +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], r.x) |> limit(fragment("?", literal(^1))) |> plan()
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)
Expand Down
8 changes: 7 additions & 1 deletion test/ecto/adapters/postgres_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,9 +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], r.x) |> limit(fragment("?", literal(^1))) |> plan()
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)
Expand Down
8 changes: 7 additions & 1 deletion test/ecto/adapters/tds_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,9 +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], r.x) |> limit(fragment("?", literal(^1))) |> plan()
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)
Expand Down
Loading