fix str_position order

tobymao · Jan 17, 2023 · a1fb957 · a1fb957
1 parent 650e123
commit a1fb957
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 10 deletions.
diff --git a/sqlglot/dialects/dialect.py b/sqlglot/dialects/dialect.py
@@ -368,7 +368,7 @@ def locate_to_strposition(args):
     )
 
 
-def strposition_to_local_sql(self, expression):
+def strposition_to_locate_sql(self, expression):
     args = self.format_args(
         expression.args.get("substr"), expression.this, expression.args.get("position")
     )

diff --git a/sqlglot/dialects/hive.py b/sqlglot/dialects/hive.py
@@ -13,7 +13,7 @@
     no_safe_divide_sql,
     no_trycast_sql,
     rename_func,
-    strposition_to_local_sql,
+    strposition_to_locate_sql,
     struct_extract_sql,
     timestrtotime_sql,
     var_map_sql,
@@ -297,7 +297,7 @@ class Generator(generator.Generator):
             exp.SchemaCommentProperty: lambda self, e: self.naked_property(e),
             exp.SetAgg: rename_func("COLLECT_SET"),
             exp.Split: lambda self, e: f"SPLIT({self.sql(e, 'this')}, CONCAT('\\\\Q', {self.sql(e, 'expression')}))",
-            exp.StrPosition: strposition_to_local_sql,
+            exp.StrPosition: strposition_to_locate_sql,
             exp.StrToDate: _str_to_date,
             exp.StrToTime: _str_to_time,
             exp.StrToUnix: _str_to_unix,

diff --git a/sqlglot/dialects/mysql.py b/sqlglot/dialects/mysql.py
@@ -10,7 +10,7 @@
     no_paren_current_date_sql,
     no_tablesample_sql,
     no_trycast_sql,
-    strposition_to_local_sql,
+    strposition_to_locate_sql,
 )
 from sqlglot.helper import seq_get
 from sqlglot.tokens import TokenType
@@ -442,7 +442,7 @@ class Generator(generator.Generator):
             exp.Trim: _trim_sql,
             exp.NullSafeEQ: lambda self, e: self.binary(e, "<=>"),
             exp.NullSafeNEQ: lambda self, e: self.not_sql(self.binary(e, "<=>")),
-            exp.StrPosition: strposition_to_local_sql,
+            exp.StrPosition: strposition_to_locate_sql,
         }
 
         ROOT_PROPERTIES = {

diff --git a/sqlglot/dialects/snowflake.py b/sqlglot/dialects/snowflake.py
@@ -218,7 +218,7 @@ class Generator(generator.Generator):
             exp.Parameter: lambda self, e: f"${self.sql(e, 'this')}",
             exp.PartitionedByProperty: lambda self, e: f"PARTITION BY {self.sql(e, 'this')}",
             exp.Matches: rename_func("DECODE"),
-            exp.StrPosition: rename_func("POSITION"),
+            exp.StrPosition: lambda self, e: f"{self.normalize_func('POSITION')}({self.format_args(e.args.get('substr'), e.this, e.args.get('position'))})",
             exp.StrToTime: lambda self, e: f"TO_TIMESTAMP({self.sql(e, 'this')}, {self.format_time(e)})",
             exp.TimeStrToTime: timestrtotime_sql,
             exp.TimeToUnix: lambda self, e: f"EXTRACT(epoch_second FROM {self.sql(e, 'this')})",

diff --git a/sqlglot/dialects/tsql.py b/sqlglot/dialects/tsql.py
@@ -264,7 +264,11 @@ class Tokenizer(tokens.Tokenizer):
     class Parser(parser.Parser):
         FUNCTIONS = {
             **parser.Parser.FUNCTIONS,  # type: ignore
-            "CHARINDEX": exp.StrPosition.from_arg_list,
+            "CHARINDEX": lambda args: exp.StrPosition(
+                this=seq_get(args, 1),
+                substr=seq_get(args, 0),
+                position=seq_get(args, 2),
+            ),
             "ISNULL": exp.Coalesce.from_arg_list,
             "DATEADD": parse_date_delta(exp.DateAdd, unit_mapping=DATE_DELTA_INTERVAL),
             "DATEDIFF": parse_date_delta(exp.DateDiff, unit_mapping=DATE_DELTA_INTERVAL),

diff --git a/sqlglot/expressions.py b/sqlglot/expressions.py
@@ -3023,7 +3023,7 @@ class Substring(Func):
 
 
 class StrPosition(Func):
-    arg_types = {"substr": True, "this": True, "position": False}
+    arg_types = {"this": True, "substr": True, "position": False}
 
 
 class StrToDate(Func):

diff --git a/sqlglot/parser.py b/sqlglot/parser.py
@@ -2625,7 +2625,11 @@ def _parse_position(self) -> exp.Expression:
             args.append(self._parse_bitwise())
 
         # Note: we're parsing in order needle, haystack, position
-        this = exp.StrPosition.from_arg_list(args)
+        this = exp.StrPosition(
+            this=seq_get(args, 1),
+            substr=seq_get(args, 0),
+            position=seq_get(args, 2),
+        )
         self.validate_expression(this, args)
 
         return this

diff --git a/tests/dialects/test_dialect.py b/tests/dialects/test_dialect.py
@@ -955,7 +955,7 @@ def test_operators(self):
             },
         )
         self.validate_all(
-            "STR_POSITION('a', x)",
+            "STR_POSITION(x, 'a')",
             write={
                 "drill": "STRPOS(x, 'a')",
                 "duckdb": "STRPOS(x, 'a')",