Merge pull request #1707 from mabel-dev/#1698-2

#1698 2
mabel-dev · May 29, 2024 · 7917c65 · 7917c65
2 parents 1124c7b + b7a39ad
commit 7917c65
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/opteryx/__version__.py b/opteryx/__version__.py
@@ -1,4 +1,4 @@
-__build__ = 535
+__build__ = 537
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/opteryx/functions/string_functions.py b/opteryx/functions/string_functions.py
@@ -234,12 +234,12 @@ def concat_ws(separator, list_values):
     return result
 
 
-def starts_w(arr, test):
-    return compute.starts_with(arr, test[0])
+def starts_w(arr, test, ignore_case=[False]):
+    return compute.starts_with(arr, test[0], ignore_case=ignore_case[0])
 
 
-def ends_w(arr, test):
-    return compute.ends_with(arr, test[0])
+def ends_w(arr, test, ignore_case=[False]):
+    return compute.ends_with(arr, test[0], ignore_case=ignore_case[0])
 
 
 def substring(

diff --git a/opteryx/planner/cost_based_optimizer/strategies/predicate_pushdown.py b/opteryx/planner/cost_based_optimizer/strategies/predicate_pushdown.py
@@ -68,7 +68,8 @@ def _rewrite_predicate(predicate):
         ):
             predicate.value = LIKE_REWRITES[predicate.value]
             return predicate
-    if predicate.value == "Like" and predicate.right.value:
+    if predicate.value in {"Like", "ILike"} and predicate.right.value:
+        ignore_case = predicate.value == "ILike"
         # Rewrite LIKEs as STARTS_WITH
         if (
             predicate.right.node_type == NodeType.LITERAL
@@ -79,7 +80,15 @@ def _rewrite_predicate(predicate):
             predicate.right.value = predicate.right.value[:-1]
             predicate.node_type = NodeType.FUNCTION
             predicate.value = "STARTS_WITH"
-            predicate.parameters = [predicate.left, predicate.right]
+            predicate.parameters = [
+                predicate.left,
+                predicate.right,
+                Node(
+                    node_type=NodeType.LITERAL,
+                    type=OrsoTypes.BOOLEAN,
+                    value=ignore_case,
+                ),
+            ]
             return predicate
         # Rewrite LIKEs as ENDS_WITH
         if (
@@ -91,7 +100,15 @@ def _rewrite_predicate(predicate):
             predicate.right.value = predicate.right.value[1:]
             predicate.node_type = NodeType.FUNCTION
             predicate.value = "ENDS_WITH"
-            predicate.parameters = [predicate.left, predicate.right]
+            predicate.parameters = [
+                predicate.left,
+                predicate.right,
+                Node(
+                    node_type=NodeType.LITERAL,
+                    type=OrsoTypes.BOOLEAN,
+                    value=ignore_case,
+                ),
+            ]
             return predicate
         if (
             predicate.right.node_type == NodeType.LITERAL
@@ -106,7 +123,11 @@ def _rewrite_predicate(predicate):
             predicate.parameters = [
                 predicate.left,
                 predicate.right,
-                Node(node_type=NodeType.LITERAL, type=OrsoTypes.BOOLEAN, value=False),
+                Node(
+                    node_type=NodeType.LITERAL,
+                    type=OrsoTypes.BOOLEAN,
+                    value=ignore_case,
+                ),
             ]
             return predicate
     if predicate.value in IN_REWRITES: