findly.unified-reporting-sdk 0.6.19__py3-none-any.whl → 0.6.21__py3-none-any.whl

findly/unified_reporting_sdk/data_sources/common/where_string_comparison.py

@@ -36,6 +36,17 @@ def parse_where_columns_from_sql_query(
         )
         return None
 
+    # Check: Verify if the where_clause_str contains only 'where' with no conditions
+    if where_clause_str.strip().lower() == "where":
+        LOGGER.info(
+            {
+                "msg": "where_clause_contains_no_conditions",
+                "where_clause": where_clause_str,
+                "sql_query": sql_query,
+            }
+        )
+        return None
+
     try:
         where_clause_maybe: Optional[Expression] = parse_one(
             sql=sql_query,
@@ -68,7 +79,7 @@ def parse_where_columns_from_sql_query(
                 pass
 
             column_operator_used_for_where_clause = condition.key
-            if column_operator_used_for_where_clause == "in":
+            if column_operator_used_for_where_clause.lower() == "in":
                 # expression list cause this is an IN operator, so we get back
                 # an array, lets handle that by iterating over the expressions
                 for expression in condition.expressions:
@@ -80,7 +91,7 @@ def parse_where_columns_from_sql_query(
                             is_not_condition=not_condition,
                         )
                     )
-            elif column_operator_used_for_where_clause == "between":
+            elif column_operator_used_for_where_clause.lower() == "between":
                 where_clause_values.append(
                     WhereClauseInformation(
                         column_name=condition.args["this"].sql(),
@@ -89,6 +100,19 @@ def parse_where_columns_from_sql_query(
                         is_not_condition=not_condition,
                     )
                 )
+            # Handle LIKE operator specifically
+            elif column_operator_used_for_where_clause.lower() == "like":
+                # Ensure correct handling of LIKE patterns, including special characters
+                column_name = condition.this.sql()
+                column_value = condition.expression.sql()
+                where_clause_values.append(
+                    WhereClauseInformation(
+                        column_name=column_name,
+                        column_operator="like",
+                        column_value=column_value,
+                        is_not_condition=not_condition,
+                    )
+                )
             else:
                 # We fail on parsing things like:
                 # CAST(A as B)
@@ -158,3 +182,12 @@ def parse_where_column_condition(
         dialect=dialect,
         where_clause_str=where_clause_str,
     )
+
+
+# main method to test it
+if __name__ == "__main__":
+    # ERROR:findly.unified_reporting_sdk.data_sources.common.where_string_comparison:{'msg': 'error_parse_where_column_condition', 'where_clause': "WHERE LOWER(cargo) LIKE LOWER('%crude%') AND WHERE LOWER(imo__ais_destination_formatted) LIKE LOWER(%rotterdam%) ", 'sql_query': "select * from table WHERE LOWER(cargo) LIKE LOWER('%crude%') AND WHERE LOWER(imo__ais_destination_formatted) LIKE LOWER(%rotterdam%) ", 'error': "Required keyword: 'expression' missing for <class 'sqlglot.expressions.And'>. Line 1, Col: 70.\n  select * from table WHERE LOWER(cargo) LIKE LOWER('%crude%') AND \x1b[4mWHERE\x1b[0m LOWER(imo__ais_destination_formatted) LIKE LOWER(%rotterdam%) "}
+    # i want to test this case above
+    where_clause_str = "WHERE LOWER(cargo) LIKE LOWER('%crude%') AND WHERE LOWER(imo__ais_destination_formatted) LIKE LOWER(%rotterdam%) "
+    dialect = "bigquery"
+    print(parse_where_column_condition(where_clause_str, dialect))

{findly_unified_reporting_sdk-0.6.19.dist-info → findly_unified_reporting_sdk-0.6.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: findly.unified-reporting-sdk
-Version: 0.6.19
+Version: 0.6.21
 Summary: 
 License: GPL-3.0-only
 Requires-Python: >=3.9,<4.0

{findly_unified_reporting_sdk-0.6.19.dist-info → findly_unified_reporting_sdk-0.6.21.dist-info}/RECORD

@@ -5,7 +5,7 @@ findly/unified_reporting_sdk/data_sources/common/__init__.py,sha256=47DEQpj8HBSa
 findly/unified_reporting_sdk/data_sources/common/common_parser.py,sha256=OymaK3T9U10ZiIpMqwYQv3ukvCmBu9ALgxS5zQmKpLY,7897
 findly/unified_reporting_sdk/data_sources/common/date_range_helper.py,sha256=z2L1YU1Mzbybkl1wZK_mXL9lKFfG6CEomvlTfADD_80,971
 findly/unified_reporting_sdk/data_sources/common/reports_client.py,sha256=fCza94iwZz05QPr6B3mmsrvQQdymgD3CzMbvAYEOetw,3647
-findly/unified_reporting_sdk/data_sources/common/where_string_comparison.py,sha256=1oIVCZF-E09WfraAvjr0vQ7NDTnao-6QPxjKRf-QMCU,6039
+findly/unified_reporting_sdk/data_sources/common/where_string_comparison.py,sha256=SUueYVxJrItDBwUJ04U5JlhebIbN_0eLuWsmrlO83Yw,8070
 findly/unified_reporting_sdk/data_sources/fb_ads/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 findly/unified_reporting_sdk/data_sources/fb_ads/fb_ads_client.py,sha256=hVrxsbf0DLoTka5B7DACBbcMeVEh4PRU_s8WZ8nlvFY,21913
 findly/unified_reporting_sdk/data_sources/fb_ads/fb_ads_query_args_parser.py,sha256=kM1ewN1bQqL_hTfbItkPGJenbwYeEpUXZEYnoTjTbDo,31949
@@ -28,7 +28,7 @@ findly/unified_reporting_sdk/protos/findly_semantic_layer_pb2.pyi,sha256=PmMDYAW
 findly/unified_reporting_sdk/urs.py,sha256=8um_pLJNOu1FGd0IO7XlNBIFAvGYD2nXnxiHMjkraKs,2915
 findly/unified_reporting_sdk/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 findly/unified_reporting_sdk/util/create_numeric_string_series.py,sha256=MmufpYatIhcVxA9e3H1dR1CrejXRnA8j4NNjJxfvBVA,457
-findly_unified_reporting_sdk-0.6.19.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-findly_unified_reporting_sdk-0.6.19.dist-info/METADATA,sha256=rA_swUXPwV6dWr7xblMwPBGeu01V3_FI2iso9ekDhEc,3160
-findly_unified_reporting_sdk-0.6.19.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-findly_unified_reporting_sdk-0.6.19.dist-info/RECORD,,
+findly_unified_reporting_sdk-0.6.21.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+findly_unified_reporting_sdk-0.6.21.dist-info/METADATA,sha256=CLvuNbY41ZHgs9oUSZdXvOw25ChIt7NuYOWqy74m9yE,3160
+findly_unified_reporting_sdk-0.6.21.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+findly_unified_reporting_sdk-0.6.21.dist-info/RECORD,,