From bbd1eea9ae5f1db7c00e17354224903774913c5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EC=84=A0=EC=9A=B0?= <seonwoo960000@toss.im>
Date: Sat, 21 Sep 2024 16:03:49 +0900
Subject: [PATCH 1/2] Add support for parenthesized conditions

---
 core/storage/sqlite3_ondisk.rs |  2 +-
 core/translate/expr.rs         | 11 +++++++++++
 testing/where.test             | 16 +++++++++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/core/storage/sqlite3_ondisk.rs b/core/storage/sqlite3_ondisk.rs
index d71cd615a..9e0e695a3 100644
--- a/core/storage/sqlite3_ondisk.rs
+++ b/core/storage/sqlite3_ondisk.rs
@@ -248,7 +248,7 @@ pub enum PageType {
 }
 
 impl TryFrom<u8> for PageType {
-    type Error = crate::error::LimboError;
+    type Error = LimboError;
 
     fn try_from(value: u8) -> Result<Self> {
         match value {
diff --git a/core/translate/expr.rs b/core/translate/expr.rs
index b06f972e8..667619d75 100644
--- a/core/translate/expr.rs
+++ b/core/translate/expr.rs
@@ -537,6 +537,17 @@ pub fn translate_condition_expr(
                 );
             }
         }
+        ast::Expr::Parenthesized(exprs) => {
+            for expr in exprs {
+                let _ = translate_condition_expr(
+                    program,
+                    referenced_tables,
+                    expr,
+                    cursor_hint,
+                    condition_metadata,
+                );
+            }
+        }
         _ => todo!("op {:?} not implemented", expr),
     }
     Ok(())
diff --git a/testing/where.test b/testing/where.test
index bbcc32eba..bd7e56fed 100755
--- a/testing/where.test
+++ b/testing/where.test
@@ -252,4 +252,18 @@ do_execsql_test where_multiple {
 
 do_execsql_test where_multiple_flipped {
     select id, first_name, age from users where age < 50 and id = 5;
-} {5|Edward|15}
\ No newline at end of file
+} {5|Edward|15}
+
+do_execsql_test where-parentheses-and {
+    select id, name from products where (id = 5 and name = 'sweatshirt') and (id = 1 and name = 'hat') ORDER BY id;
+} {}
+
+do_execsql_test where-nested-parentheses {
+    select id, name from products where ((id = 5 and name = 'sweatshirt') or (id = 1 and name = 'hat')) ORDER BY id;
+} {1|hat
+5|sweatshirt}
+
+do_execsql_test where-complex-parentheses {
+    select id, name from products where ((id = 5 and name = 'sweatshirt') or (id = 1 and name = 'hat')) and (name = 'sweatshirt' or name = 'hat') ORDER BY id;
+} {1|hat
+5|sweatshirt}

From eb55b7379c97866287132edd4b1181cb90d5f4e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EC=84=A0=EC=9A=B0?= <seonwoo960000@toss.im>
Date: Sat, 21 Sep 2024 16:12:10 +0900
Subject: [PATCH 2/2] Fix failing test

---
 testing/where.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/where.test b/testing/where.test
index bd7e56fed..4cb5d1978 100755
--- a/testing/where.test
+++ b/testing/where.test
@@ -255,8 +255,8 @@ do_execsql_test where_multiple_flipped {
 } {5|Edward|15}
 
 do_execsql_test where-parentheses-and {
-    select id, name from products where (id = 5 and name = 'sweatshirt') and (id = 1 and name = 'hat') ORDER BY id;
-} {}
+    select id, name from products where (id = 5 and name = 'sweatshirt') and (id = 5 and name = 'sweatshirt') ORDER BY id;
+} {5|sweatshirt}
 
 do_execsql_test where-nested-parentheses {
     select id, name from products where ((id = 5 and name = 'sweatshirt') or (id = 1 and name = 'hat')) ORDER BY id;