Fix!: dict conversion had incorrect ast

tobymao · Aug 14, 2023 · 2e73a4f · 2e73a4f
1 parent 74fc28a
commit 2e73a4f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/sqlglot/expressions.py b/sqlglot/expressions.py
@@ -5863,8 +5863,8 @@ def convert(value: t.Any, copy: bool = False) -> Expression:
         return Array(expressions=[convert(v, copy=copy) for v in value])
     if isinstance(value, dict):
         return Map(
-            keys=[convert(k, copy=copy) for k in value],
-            values=[convert(v, copy=copy) for v in value.values()],
+            keys=Array(expressions=[convert(k, copy=copy) for k in value]),
+            values=Array(expressions=[convert(v, copy=copy) for v in value.values()]),
         )
     raise ValueError(f"Cannot convert {value}")
 

diff --git a/tests/test_build.py b/tests/test_build.py
@@ -496,7 +496,7 @@ def test_build(self):
             ),
             (
                 lambda: exp.update("tbl", {"x": None, "y": {"x": 1}}),
-                "UPDATE tbl SET x = NULL, y = MAP('x', 1)",
+                "UPDATE tbl SET x = NULL, y = MAP(ARRAY('x'), ARRAY(1))",
             ),
             (
                 lambda: exp.update("tbl", {"x": 1}, where="y > 0"),

diff --git a/tests/test_expressions.py b/tests/test_expressions.py
@@ -666,7 +666,7 @@ def test_convert(self):
             (True, "TRUE"),
             ((1, "2", None), "(1, '2', NULL)"),
             ([1, "2", None], "ARRAY(1, '2', NULL)"),
-            ({"x": None}, "MAP('x', NULL)"),
+            ({"x": None}, "MAP(ARRAY('x'), ARRAY(NULL))"),
             (
                 datetime.datetime(2022, 10, 1, 1, 1, 1, 1),
                 "TIME_STR_TO_TIME('2022-10-01T01:01:01.000001+00:00')",
@@ -681,6 +681,11 @@ def test_convert(self):
             with self.subTest(value):
                 self.assertEqual(exp.convert(value).sql(), expected)
 
+        self.assertEqual(
+            exp.convert({"test": "value"}).sql(dialect="spark"),
+            "MAP_FROM_ARRAYS(ARRAY('test'), ARRAY('value'))",
+        )
+
     def test_comment_alias(self):
         sql = """
         SELECT