findly.unified-reporting-sdk 0.6.20__tar.gz → 0.6.22__tar.gz

{findly_unified_reporting_sdk-0.6.20 → findly_unified_reporting_sdk-0.6.22}/PKG-INFO

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

{findly_unified_reporting_sdk-0.6.20 → findly_unified_reporting_sdk-0.6.22}/findly/unified_reporting_sdk/data_sources/common/where_string_comparison.py

@@ -31,6 +31,7 @@ def parse_where_columns_from_sql_query(
             {
                 "msg": "empty_or_missing_where_clause",
                 "where_clause": where_clause_str,
+                "dialect": dialect,
                 "sql_query": sql_query,
             }
         )
@@ -42,6 +43,7 @@ def parse_where_columns_from_sql_query(
             {
                 "msg": "where_clause_contains_no_conditions",
                 "where_clause": where_clause_str,
+                "dialect": dialect,
                 "sql_query": sql_query,
             }
         )
@@ -58,6 +60,7 @@ def parse_where_columns_from_sql_query(
                 {
                     "msg": "parse_where_column_condition_no_where_clause",
                     "where_clause": where_clause_str,
+                    "dialect": dialect,
                     "sql_query": sql_query,
                 }
             )
@@ -79,7 +82,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:
@@ -91,7 +94,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(),
@@ -100,6 +103,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)
@@ -122,6 +138,7 @@ def parse_where_columns_from_sql_query(
                             "condition": condition.this.sql(),
                             "where_clause": where_clause_str,
                             "sql_query": sql_query,
+                            "dialect": dialect,
                             "error": str(e),
                         }
                     )
@@ -130,6 +147,7 @@ def parse_where_columns_from_sql_query(
                 "msg": "parse_where_column_condition_values",
                 "where_clause": where_clause_str,
                 "sql_query": sql_query,
+                "dialect": dialect,
                 "where_clause_values": [
                     dataclasses.asdict(value) for value in where_clause_values
                 ],
@@ -142,6 +160,7 @@ def parse_where_columns_from_sql_query(
                 "msg": "error_parse_where_column_condition",
                 "where_clause": where_clause_str,
                 "sql_query": sql_query,
+                "dialect": dialect,
                 "error": str(e),
             }
         )
@@ -169,3 +188,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.20 → findly_unified_reporting_sdk-0.6.22}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "findly.unified-reporting-sdk"
-version = "0.6.20"
+version = "0.6.22"
 license = "GPL-3.0-only"
 description = ""
 authors = []