From 5d56ad65b1a32a9d4f1548d7ac5495ee7af0e2f9 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Fri, 3 May 2024 16:57:37 -0700
Subject: [PATCH] Account for multiple "and" and "or"

---
 src/python/select_from_results.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/python/select_from_results.py b/src/python/select_from_results.py
index 58bd4fbb64..43045a5688 100755
--- a/src/python/select_from_results.py
+++ b/src/python/select_from_results.py
@@ -26,9 +26,9 @@
 def columns_in_query(query):
     """Returns all the identifiers used in the query."""
     result = re.findall(r"""(?<!['"])\b[A-Za-z][A-Za-z_]*\b(?!['"])""", query)
-    if "and" in result:
+    while "and" in result:
         result.remove("and")
-    if "or" in result:
+    while "or" in result:
         result.remove("or")
     return result
 
@@ -71,8 +71,6 @@ def main():
     # Gross way to produce output to standard out
     with tempfile.NamedTemporaryFile() as tmpfile:
         df.to_csv(tmpfile)
-        print("tmpfile:")
-        print(tmpfile.name)
         system("cat " + tmpfile.name)