Skip to content

Commit 86234e7

Browse files
committed
Fix precedence issue in queries, closes #754
1 parent 2385763 commit 86234e7

4 files changed

Lines changed: 76 additions & 12 deletions

File tree

‎lib/ecto/adapters/myxql/connection.ex‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ if Code.ensure_loaded?(MyXQL) do
481481
end
482482

483483
defp update_op(:inc, quoted_key, value, sources, query) do
484-
[quoted_key, " = ", quoted_key, " + " | expr(value, sources, query)]
484+
[quoted_key, " = ", quoted_key, " + " | op_to_binary(value, sources, query)]
485485
end
486486

487487
defp update_op(command, _quoted_key, _value, _sources, query) do
@@ -720,7 +720,7 @@ if Code.ensure_loaded?(MyXQL) do
720720

721721
defp expr({:in, _, [left, right]}, sources, query) when is_list(right) do
722722
args = Enum.map_intersperse(right, ?,, &expr(&1, sources, query))
723-
[expr(left, sources, query), " IN (", args, ?)]
723+
[op_to_binary(left, sources, query), " IN (", args, ?)]
724724
end
725725

726726
defp expr({:in, _, [_, {:^, _, [_, 0]}]}, _sources, _query) do
@@ -729,19 +729,19 @@ if Code.ensure_loaded?(MyXQL) do
729729

730730
defp expr({:in, _, [left, {:^, _, [_, length]}]}, sources, query) do
731731
args = Enum.intersperse(List.duplicate(??, length), ?,)
732-
[expr(left, sources, query), " IN (", args, ?)]
732+
[op_to_binary(left, sources, query), " IN (", args, ?)]
733733
end
734734

735735
defp expr({:in, _, [left, %Ecto.SubQuery{} = subquery]}, sources, query) do
736-
[expr(left, sources, query), " IN ", expr(subquery, sources, query)]
736+
[op_to_binary(left, sources, query), " IN ", expr(subquery, sources, query)]
737737
end
738738

739739
defp expr({:in, _, [left, right]}, sources, query) do
740-
[expr(left, sources, query), " = ANY(", expr(right, sources, query), ?)]
740+
[op_to_binary(left, sources, query), " = ANY(", expr(right, sources, query), ?)]
741741
end
742742

743743
defp expr({:is_nil, _, [arg]}, sources, query) do
744-
[expr(arg, sources, query) | " IS NULL"]
744+
[op_to_binary(arg, sources, query) | " IS NULL"]
745745
end
746746

747747
defp expr({:not, _, [expr]}, sources, query) do
@@ -934,7 +934,7 @@ if Code.ensure_loaded?(MyXQL) do
934934
end
935935

936936
defp interval(count, "millisecond", sources, query) do
937-
["INTERVAL (", expr(count, sources, query) | " * 1000) microsecond"]
937+
["INTERVAL (", op_to_binary(count, sources, query) | " * 1000) microsecond"]
938938
end
939939

940940
defp interval(count, interval, sources, query) do

‎lib/ecto/adapters/postgres/connection.ex‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ if Code.ensure_loaded?(Postgrex) do
665665
" = ",
666666
quote_qualified_name(key, sources, 0),
667667
" + "
668-
| expr(value, sources, query)
668+
| maybe_paren(value, sources, query)
669669
]
670670
end
671671

@@ -1013,10 +1013,12 @@ if Code.ensure_loaded?(Postgrex) do
10131013

10141014
defp expr({:datetime_add, _, [datetime, count, interval]}, sources, query) do
10151015
[
1016+
?(,
10161017
expr(datetime, sources, query),
10171018
type_unless_typed(datetime, "timestamp"),
10181019
" + ",
1019-
interval(count, interval, sources, query)
1020+
interval(count, interval, sources, query),
1021+
?)
10201022
]
10211023
end
10221024

@@ -1195,7 +1197,13 @@ if Code.ensure_loaded?(Postgrex) do
11951197
end
11961198

11971199
defp interval(count, interval, sources, query) do
1198-
[?(, expr(count, sources, query), "::numeric * ", interval(1, interval, sources, query), ?)]
1200+
[
1201+
?(,
1202+
maybe_paren(count, sources, query),
1203+
"::numeric * ",
1204+
interval(1, interval, sources, query),
1205+
?)
1206+
]
11991207
end
12001208

12011209
defp maybe_paren({op, _, [_, _]} = expr, sources, query) when op in @binary_ops,

‎test/ecto/adapters/myxql_test.exs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,31 @@ defmodule Ecto.Adapters.MyXQLTest do
638638

639639
query = "schema" |> select([r], r.x == is_nil(r.y)) |> plan()
640640
assert all(query) == ~s{SELECT s0.`x` = (s0.`y` IS NULL) FROM `schema` AS s0}
641+
642+
query = "schema" |> select([r], is_nil(r.x and r.y)) |> plan()
643+
assert all(query) == ~s{SELECT (s0.`x` AND s0.`y`) IS NULL FROM `schema` AS s0}
644+
645+
query = "schema" |> select([r], is_nil(not r.x)) |> plan()
646+
assert all(query) == ~s{SELECT (NOT (s0.`x`)) IS NULL FROM `schema` AS s0}
647+
end
648+
649+
test "in preserves the left expression" do
650+
query = "schema" |> select([r], (not r.x) in [true, false]) |> plan()
651+
assert all(query) == ~s{SELECT (NOT (s0.`x`)) IN (TRUE,FALSE) FROM `schema` AS s0}
652+
653+
query = "schema" |> select([r], (r.x == r.y) in [true, false]) |> plan()
654+
assert all(query) == ~s{SELECT (s0.`x` = s0.`y`) IN (TRUE,FALSE) FROM `schema` AS s0}
655+
end
656+
657+
test "millisecond interval preserves the count expression" do
658+
datetime_query =
659+
"schema" |> select([s], datetime_add(s.foo, s.x + s.y, "millisecond")) |> plan()
660+
661+
date_query = "schema" |> select([s], date_add(s.foo, s.x + s.y, "millisecond")) |> plan()
662+
663+
for query <- [datetime_query, date_query] do
664+
assert all(query) =~ ~s{INTERVAL ((s0.`x` + s0.`y`) * 1000) microsecond}
665+
end
641666
end
642667

643668
test "order_by and types" do
@@ -985,6 +1010,9 @@ defmodule Ecto.Adapters.MyXQLTest do
9851010
assert update_all(query) ==
9861011
~s{UPDATE `schema` AS s0 SET s0.`x` = 0, s0.`y` = s0.`y` + 1, s0.`z` = s0.`z` + -3}
9871012

1013+
query = from(m in Schema, update: [inc: [x: m.y + m.z]]) |> plan(:update_all)
1014+
assert update_all(query) == ~s{UPDATE `schema` AS s0 SET s0.`x` = s0.`x` + (s0.`y` + s0.`z`)}
1015+
9881016
query = from(e in Schema, where: e.x == 123, update: [set: [x: 0]]) |> plan(:update_all)
9891017

9901018
assert update_all(query) ==

‎test/ecto/adapters/postgres_test.exs‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -949,7 +949,7 @@ defmodule Ecto.Adapters.PostgresTest do
949949
|> plan()
950950

951951
assert all(query) ==
952-
~s{SELECT TRUE FROM "schema" AS s0 WHERE (s0."foo"::timestamp + interval '1 month' > s0."bar")}
952+
~s{SELECT TRUE FROM "schema" AS s0 WHERE ((s0."foo"::timestamp + interval '1 month') > s0."bar")}
953953

954954
query =
955955
"schema"
@@ -958,7 +958,32 @@ defmodule Ecto.Adapters.PostgresTest do
958958
|> plan()
959959

960960
assert all(query) ==
961-
~s{SELECT TRUE FROM "schema" AS s0 WHERE (s0."foo"::varchar + interval '1 month' > s0."bar")}
961+
~s{SELECT TRUE FROM "schema" AS s0 WHERE ((s0."foo"::varchar + interval '1 month') > s0."bar")}
962+
end
963+
964+
test "date and datetime arithmetic preserve the count expression" do
965+
for unit <- ["day", "month"] do
966+
datetime_sum = "schema" |> select([s], datetime_add(s.foo, s.x + s.y, ^unit)) |> plan()
967+
date_sum = "schema" |> select([s], date_add(s.foo, s.x + s.y, ^unit)) |> plan()
968+
datetime_div = "schema" |> select([s], datetime_add(s.foo, s.x / s.y, ^unit)) |> plan()
969+
date_div = "schema" |> select([s], date_add(s.foo, s.x / s.y, ^unit)) |> plan()
970+
971+
for query <- [datetime_sum, date_sum] do
972+
assert all(query) =~ ~s{(s0."x" + s0."y")::numeric * interval '1 #{unit}'}
973+
end
974+
975+
for query <- [datetime_div, date_div] do
976+
assert all(query) =~ ~s{(s0."x" / s0."y")::numeric * interval '1 #{unit}'}
977+
end
978+
end
979+
980+
query =
981+
"schema"
982+
|> select([s], fragment("?::date", datetime_add(s.foo, s.x, "day")))
983+
|> plan()
984+
985+
assert all(query) ==
986+
~s{SELECT (s0."foo"::timestamp + (s0."x"::numeric * interval '1 day'))::date FROM "schema" AS s0}
962987
end
963988

964989
test "tagged type" do
@@ -1318,6 +1343,9 @@ defmodule Ecto.Adapters.PostgresTest do
13181343
assert update_all(query) ==
13191344
~s{UPDATE "schema" AS s0 SET "x" = 0, "y" = s0."y" + 1, "z" = s0."z" + -3}
13201345

1346+
query = from(m in Schema, update: [inc: [x: m.y + m.z]]) |> plan(:update_all)
1347+
assert update_all(query) == ~s{UPDATE "schema" AS s0 SET "x" = s0."x" + (s0."y" + s0."z")}
1348+
13211349
query = from(e in Schema, where: e.x == 123, update: [set: [x: 0]]) |> plan(:update_all)
13221350

13231351
assert update_all(query) ==

0 commit comments

Comments
 (0)