HJ-116 - Fix BigQuery partitioning queries to properly support multiple identity clauses

src/fides/api/service/connectors/query_config.py

@@ -896,7 +896,7 @@ def get_formatted_query_string(
         Returns a query string with backtick formatting for tables that have the same names as
         BigQuery reserved words.
         """
-        return f'SELECT {field_list} FROM `{self._generate_table_name()}` WHERE {" OR ".join(clauses)}'
+        return f'SELECT {field_list} FROM `{self._generate_table_name()}` WHERE ({" OR ".join(clauses)})'
 
     def generate_masking_stmt(
         self,

tests/ops/service/connectors/test_bigquery_connector.py

@@ -14,7 +14,6 @@
 from fides.api.service.connectors.sql_connector import BigQueryConnector
 
 
-@pytest.mark.skip(reason="move to plus in progress")
 @pytest.mark.integration_external
 @pytest.mark.integration_bigquery
 class TestBigQueryConnector:

tests/ops/service/connectors/test_queryconfig.py

@@ -994,7 +994,6 @@ def test_query_to_str(self, complete_execution_node):
         assert query_to_str == "SELECT name FROM users WHERE email = 'test@example.com'"
 
 
-@pytest.mark.skip(reason="move to plus in progress")
 @pytest.mark.integration_external
 @pytest.mark.integration_bigquery
 class TestBigQueryQueryConfig:
@@ -1026,16 +1025,16 @@ def execution_node(
                 BigQueryNamespaceMeta(
                     project_id="cool_project", dataset_id="first_dataset"
                 ),
-                "SELECT address_id, created, email, id, name FROM `cool_project.first_dataset.customer` WHERE email = :email",
+                "SELECT address_id, created, email, id, name FROM `cool_project.first_dataset.customer` WHERE (email = :email)",
             ),
             # Namespace meta will be a dict / JSON when retrieved from the DB
             (
                 {"project_id": "cool_project", "dataset_id": "first_dataset"},
-                "SELECT address_id, created, email, id, name FROM `cool_project.first_dataset.customer` WHERE email = :email",
+                "SELECT address_id, created, email, id, name FROM `cool_project.first_dataset.customer` WHERE (email = :email)",
             ),
             (
                 None,
-                "SELECT address_id, created, email, id, name FROM `customer` WHERE email = :email",
+                "SELECT address_id, created, email, id, name FROM `customer` WHERE (email = :email)",
             ),
         ],
     )