fix: addressing mismatch in STR_POSITION argument order in executor. (#4574)

Co-authored-by: cecily_carver <[email protected]>

Author: cecilycarver

sqlglot/executor/env.py

@@ -75,8 +75,8 @@ def _func(*args):
     return decorator
 
 
-@null_if_any("substr", "this")
-def str_position(substr, this, position=None):
+@null_if_any("this", "substr")
+def str_position(this, substr, position=None):
     position = position - 1 if position is not None else position
     return this.find(substr, position) + 1
 

tests/test_executor.py

@@ -613,10 +613,10 @@ def test_scalar_functions(self):
             ("CONCAT('a', 'b')", "ab"),
             ("CONCAT('a', NULL)", None),
             ("CONCAT_WS('_', 'a', 'b')", "a_b"),
-            ("STR_POSITION('bar', 'foobarbar')", 4),
-            ("STR_POSITION('bar', 'foobarbar', 5)", 7),
-            ("STR_POSITION(NULL, 'foobarbar')", None),
-            ("STR_POSITION('bar', NULL)", None),
+            ("STR_POSITION('foobarbar', 'bar')", 4),
+            ("STR_POSITION('foobarbar', 'bar', 5)", 7),
+            ("STR_POSITION('foobarbar', NULL)", None),
+            ("STR_POSITION(NULL, 'bar')", None),
             ("UPPER('foo')", "FOO"),
             ("UPPER(NULL)", None),
             ("LOWER('FOO')", "foo"),

tests/test_expressions.py

@@ -632,6 +632,12 @@ def test_walk(self):
         self.assertTrue(all(isinstance(e, exp.Expression) for e in expression.walk()))
         self.assertTrue(all(isinstance(e, exp.Expression) for e in expression.walk(bfs=False)))
 
+    def test_str_position_order(self):
+        str_position_exp = parse_one("STR_POSITION('mytest', 'test')")
+        self.assertIsInstance(str_position_exp, exp.StrPosition)
+        self.assertEqual(str_position_exp.args.get("this").this, "mytest")
+        self.assertEqual(str_position_exp.args.get("substr").this, "test")
+
     def test_functions(self):
         self.assertIsInstance(parse_one("x LIKE ANY (y)"), exp.Like)
         self.assertIsInstance(parse_one("x ILIKE ANY (y)"), exp.ILike)