@@ -860,7 +860,7 @@ defmodule Ecto.Adapters.SQLite3.Connection do
860860 quoted_key ,
861861 " = " ,
862862 quoted_key ,
863- " + " | maybe_paren ( value , sources , query )
863+ " + " | maybe_paren_expr ( value , sources , query )
864864 ]
865865 end
866866
@@ -1189,7 +1189,7 @@ defmodule Ecto.Adapters.SQLite3.Connection do
11891189
11901190 defp expr ( { :in , _ , [ left , right ] } , sources , query ) when is_list ( right ) do
11911191 args = Enum . map_intersperse ( right , ?, , & expr ( & 1 , sources , query ) )
1192- [ maybe_paren ( left , sources , query ) , " IN (" , args , ?) ]
1192+ [ maybe_paren_expr ( left , sources , query ) , " IN (" , args , ?) ]
11931193 end
11941194
11951195 defp expr ( { :in , _ , [ _ , { :^ , _ , [ _ , 0 ] } ] } , _sources , _query ) do
@@ -1198,17 +1198,17 @@ defmodule Ecto.Adapters.SQLite3.Connection do
11981198
11991199 defp expr ( { :in , _ , [ left , { :^ , _ , [ _ , len ] } ] } , sources , query ) do
12001200 args = Enum . intersperse ( List . duplicate ( ?? , len ) , ?, )
1201- [ maybe_paren ( left , sources , query ) , " IN (" , args , ?) ]
1201+ [ maybe_paren_expr ( left , sources , query ) , " IN (" , args , ?) ]
12021202 end
12031203
12041204 defp expr ( { :in , _ , [ left , % Ecto.SubQuery { } = subquery ] } , sources , query ) do
1205- [ maybe_paren ( left , sources , query ) , " IN " , expr ( subquery , sources , query ) ]
1205+ [ maybe_paren_expr ( left , sources , query ) , " IN " , expr ( subquery , sources , query ) ]
12061206 end
12071207
12081208 # Super Hack to handle arrays in json
12091209 defp expr ( { :in , _ , [ left , right ] } , sources , query ) do
12101210 [
1211- maybe_paren ( left , sources , query ) ,
1211+ maybe_paren_expr ( left , sources , query ) ,
12121212 " IN (SELECT value FROM JSON_EACH(" ,
12131213 expr ( right , sources , query ) ,
12141214 ?) ,
@@ -1217,7 +1217,7 @@ defmodule Ecto.Adapters.SQLite3.Connection do
12171217 end
12181218
12191219 defp expr ( { :is_nil , _ , [ arg ] } , sources , query ) do
1220- [ maybe_paren ( arg , sources , query ) | " IS NULL" ]
1220+ [ maybe_paren_expr ( arg , sources , query ) | " IS NULL" ]
12211221 end
12221222
12231223 defp expr ( { :not , _ , [ expression ] } , sources , query ) do
@@ -1477,7 +1477,7 @@ defmodule Ecto.Adapters.SQLite3.Connection do
14771477 defp fragment_expr ( parts , sources , query ) do
14781478 Enum . map ( parts , fn
14791479 { :raw , part } -> part
1480- { :expr , expr } -> maybe_paren ( expr , sources , query )
1480+ { :expr , expr } -> maybe_paren_expr ( expr , sources , query )
14811481 end )
14821482 |> parens_for_select ( )
14831483 end
@@ -1488,19 +1488,19 @@ defmodule Ecto.Adapters.SQLite3.Connection do
14881488 end
14891489
14901490 defp interval ( count , "millisecond" , sources , query ) do
1491- [ ?( , maybe_paren ( count , sources , query ) , " / 1000.0) || ' seconds'" ]
1491+ [ ?( , maybe_paren_expr ( count , sources , query ) , " / 1000.0) || ' seconds'" ]
14921492 end
14931493
14941494 defp interval ( count , "week" , sources , query ) do
1495- [ ?( , maybe_paren ( count , sources , query ) , " * 7) || ' days'" ]
1495+ [ ?( , maybe_paren_expr ( count , sources , query ) , " * 7) || ' days'" ]
14961496 end
14971497
14981498 defp interval ( count , interval , sources , query ) do
1499- [ maybe_paren ( count , sources , query ) , " || ' " , interval , "'" ]
1499+ [ maybe_paren_expr ( count , sources , query ) , " || ' " , interval , "'" ]
15001500 end
15011501
15021502 defp op_to_binary ( expression , sources , query ) do
1503- maybe_paren ( expression , sources , query )
1503+ maybe_paren_expr ( expression , sources , query )
15041504 end
15051505
15061506 def create_names ( query ) do
@@ -1750,23 +1750,24 @@ defmodule Ecto.Adapters.SQLite3.Connection do
17501750 defp reference_on_update ( :restrict ) , do: " ON UPDATE RESTRICT"
17511751 defp reference_on_update ( _ ) , do: [ ]
17521752
1753- defp maybe_paren ( { op , _ , [ _ , _ ] } = expr , sources , query ) when op in @ binary_ops do
1753+ defp maybe_paren_expr ( { op , _ , [ _ , _ ] } = expr , sources , query )
1754+ when op in @ binary_ops do
17541755 paren_expr ( expr , sources , query )
17551756 end
17561757
1757- defp maybe_paren ( { :is_nil , _ , [ _ ] } = expr , sources , query ) do
1758+ defp maybe_paren_expr ( { :is_nil , _ , [ _ ] } = expr , sources , query ) do
17581759 paren_expr ( expr , sources , query )
17591760 end
17601761
1761- defp maybe_paren ( { :not , _ , [ _ ] } = expr , sources , query ) do
1762+ defp maybe_paren_expr ( { :not , _ , [ _ ] } = expr , sources , query ) do
17621763 paren_expr ( expr , sources , query )
17631764 end
17641765
1765- defp maybe_paren ( { :in , _ , [ _ , _ ] } = expr , sources , query ) do
1766+ defp maybe_paren_expr ( { :in , _ , [ _ , _ ] } = expr , sources , query ) do
17661767 paren_expr ( expr , sources , query )
17671768 end
17681769
1769- defp maybe_paren ( expr , sources , query ) do
1770+ defp maybe_paren_expr ( expr , sources , query ) do
17701771 expr ( expr , sources , query )
17711772 end
17721773
0 commit comments