From b640437c9de1efe01a14a2bf5ef2045f06207db9 Mon Sep 17 00:00:00 2001
From: Gigitsu <gigitsu.23@gmail.com>
Date: Sat, 25 Nov 2023 19:46:53 +0100
Subject: [PATCH] Add bitwise function and better handling parenthesis

---
 lib/ecto/adapters/postgres/connection.ex | 11 +++++---
 test/ecto/adapters/postgres_test.exs     | 34 +++++++++++++++++++++---
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/lib/ecto/adapters/postgres/connection.ex b/lib/ecto/adapters/postgres/connection.ex
index 18f2390d..8b1cefe9 100644
--- a/lib/ecto/adapters/postgres/connection.ex
+++ b/lib/ecto/adapters/postgres/connection.ex
@@ -435,7 +435,12 @@ if Code.ensure_loaded?(Postgrex) do
       and: " AND ",
       or: " OR ",
       ilike: " ILIKE ",
-      like: " LIKE "
+      like: " LIKE ",
+      band: " & ",
+      bor: " | ",
+      bxor: " # ",
+      bsl: " << ",
+      bsr: " >> "
     ]
 
     @binary_ops Keyword.keys(binary_ops)
@@ -880,8 +885,8 @@ if Code.ensure_loaded?(Postgrex) do
       ["NOT (", expr(expr, sources, query), ?)]
     end
 
-    defp expr({:~~~, _, [expr]}, sources, query) do
-      ["~(", expr(expr, sources, query), ?)]
+    defp expr({bnot, _, [expr]}, sources, query) when bnot in ~w(~~~ bnot)a do
+      ["~" | maybe_paren(expr, sources, query)]
     end
 
     defp expr(%Ecto.SubQuery{query: query}, sources, parent_query) do
diff --git a/test/ecto/adapters/postgres_test.exs b/test/ecto/adapters/postgres_test.exs
index 94f43d0c..33f0e2ab 100644
--- a/test/ecto/adapters/postgres_test.exs
+++ b/test/ecto/adapters/postgres_test.exs
@@ -777,9 +777,7 @@ defmodule Ecto.Adapters.PostgresTest do
 
     query = Schema |> select([r], r.x &&& 2) |> plan()
     assert all(query) == ~s{SELECT s0."x" & 2 FROM "schema" AS s0}
-  end
 
-  test "bitwise ops" do
     query = Schema |> select([r], r.x ||| 2) |> plan()
     assert all(query) == ~s{SELECT s0."x" | 2 FROM "schema" AS s0}
 
@@ -789,8 +787,38 @@ defmodule Ecto.Adapters.PostgresTest do
     query = Schema |> select([r], r.x >>> 2) |> plan()
     assert all(query) == ~s{SELECT s0."x" >> 2 FROM "schema" AS s0}
 
+  end
+
+  test "unary ops" do
     query = Schema |> select([r], ~~~r.x) |> plan()
-    assert all(query) == ~s{SELECT ~(s0."x") FROM "schema" AS s0}
+    assert all(query) == ~s{SELECT ~s0."x" FROM "schema" AS s0}
+  end
+
+  test "bitwise functions" do
+    query = Schema |> select([r], band(r.x, 2)) |> plan()
+    assert all(query) == ~s{SELECT s0."x" & 2 FROM "schema" AS s0}
+
+    query = Schema |> select([r], bor(r.x, 2)) |> plan()
+    assert all(query) == ~s{SELECT s0."x" | 2 FROM "schema" AS s0}
+
+    query = Schema |> select([r], bxor(r.x, 2)) |> plan()
+    assert all(query) == ~s{SELECT s0."x" # 2 FROM "schema" AS s0}
+
+    query = Schema |> select([r], bsl(r.x, 2)) |> plan()
+    assert all(query) == ~s{SELECT s0."x" << 2 FROM "schema" AS s0}
+
+    query = Schema |> select([r], bsr(r.x, 2)) |> plan()
+    assert all(query) == ~s{SELECT s0."x" >> 2 FROM "schema" AS s0}
+
+    query = Schema |> select([r], bnot(r.x)) |> plan()
+    assert all(query) == ~s{SELECT ~s0."x" FROM "schema" AS s0}
+
+    # test parenthesis
+    query = Schema |> select([r], band(r.x ||| 1, 2)) |> plan()
+    assert all(query) == ~s{SELECT (s0."x" | 1) & 2 FROM "schema" AS s0}
+
+    query = Schema |> select([r], bnot(r.x &&& 1)) |> plan()
+    assert all(query) == ~s{SELECT ~(s0."x" & 1) FROM "schema" AS s0}
   end
 
   test "is_nil" do