updates to parameters and tests

Author: fivetran-kwoodbeck

sqlglot/expressions.py

@@ -7442,30 +7442,28 @@ class MapFromEntries(Func):
 
 
 class MapCat(Func):
-    arg_types = {"this": True, "expressions": False}
-    is_var_len_args = True
+    arg_types = {"this": True, "expressions": True}
 
 
 class MapContainsKey(Func):
-    arg_types = {"this": True, "expression": True}
+    arg_types = {"this": True, "key": True}
 
 
 class MapDelete(Func):
-    arg_types = {"this": True, "expressions": False}
+    arg_types = {"this": True, "key": True}
     is_var_len_args = True
 
 
 class MapInsert(Func):
-    arg_types = {"this": True, "expressions": False}
-    is_var_len_args = True
+    arg_types = {"this": True, "key": False, "value": True, "update_flag": False}
 
 
 class MapKeys(Func):
     pass
 
 
 class MapPick(Func):
-    arg_types = {"this": True, "expressions": False}
+    arg_types = {"this": True, "expressions": True}
     is_var_len_args = True
 
 

tests/dialects/test_snowflake.py

@@ -310,26 +310,14 @@ def test_snowflake(self):
         self.validate_identity("SELECT TIMEADD(HOUR, 2, CAST('09:05:03' AS TIME))")
         self.validate_identity("SELECT CAST(OBJECT_CONSTRUCT('a', 1) AS MAP(VARCHAR, INT))")
         self.validate_identity(
-            "SELECT MAP_CAT(CAST(OBJECT_CONSTRUCT('a', '1') AS MAP(VARCHAR, VARCHAR)), CAST(OBJECT_CONSTRUCT('b', '2') AS MAP(VARCHAR, VARCHAR)))"
-        )
-        self.validate_identity(
-            "SELECT MAP_CONTAINS_KEY('k1', CAST(OBJECT_CONSTRUCT('k1', 'v1', 'k2', 'v2', 'k3', 'v3') AS MAP(VARCHAR, VARCHAR)))"
-        )
-        self.validate_identity(
-            "SELECT MAP_DELETE(CAST(OBJECT_CONSTRUCT('a', '1', 'b', '2', 'c', '3') AS MAP(VARCHAR, VARCHAR)), 'b')"
-        )
-        self.validate_identity(
-            "SELECT MAP_INSERT(CAST(OBJECT_CONSTRUCT('a', '1') AS MAP(VARCHAR, VARCHAR)), 'b', '2')"
-        )
-        self.validate_identity(
-            "SELECT MAP_KEYS(CAST(OBJECT_CONSTRUCT('a', '1', 'b', '2') AS MAP(VARCHAR, VARCHAR)))"
-        )
-        self.validate_identity(
-            "SELECT MAP_PICK(CAST(OBJECT_CONSTRUCT('a', '1', 'b', '2', 'c', '3') AS MAP(VARCHAR, VARCHAR)), 'a', 'c')"
-        )
-        self.validate_identity(
-            "SELECT MAP_SIZE(CAST(OBJECT_CONSTRUCT('a', '1', 'b', '2') AS MAP(VARCHAR, VARCHAR)))"
-        )
+            "SELECT MAP_CAT(CAST(col AS MAP(VARCHAR, VARCHAR)), CAST(col AS MAP(VARCHAR, VARCHAR)))"
+        )
+        self.validate_identity("SELECT MAP_CONTAINS_KEY('k1', CAST(col AS MAP(VARCHAR, VARCHAR)))")
+        self.validate_identity("SELECT MAP_DELETE(CAST(col AS MAP(VARCHAR, VARCHAR)), 'k1')")
+        self.validate_identity("SELECT MAP_INSERT(CAST(col AS MAP(VARCHAR, VARCHAR)), 'b', '2')")
+        self.validate_identity("SELECT MAP_KEYS(CAST(col AS MAP(VARCHAR, VARCHAR)))")
+        self.validate_identity("SELECT MAP_PICK(CAST(col AS MAP(VARCHAR, VARCHAR)), 'a', 'c')")
+        self.validate_identity("SELECT MAP_SIZE(CAST(col AS MAP(VARCHAR, VARCHAR)))")
         self.validate_identity("SELECT CAST(OBJECT_CONSTRUCT('a', 1) AS OBJECT(a CHAR NOT NULL))")
         self.validate_identity("SELECT CAST([1, 2, 3] AS ARRAY(INT))")
         self.validate_identity("SELECT CAST(obj AS OBJECT(x CHAR) RENAME FIELDS)")

tests/fixtures/optimizer/annotate_functions.sql

@@ -2953,31 +2953,31 @@ LTRIM(NULL);
 VARCHAR;
 
 # dialect: snowflake
-MAP_CAT(CAST(OBJECT_CONSTRUCT('a', '1') AS MAP(VARCHAR, VARCHAR)), CAST(OBJECT_CONSTRUCT('b', '2') AS MAP(VARCHAR, VARCHAR)));
+MAP_CAT(CAST(col AS MAP(VARCHAR, VARCHAR)), CAST(col AS MAP(VARCHAR, VARCHAR)));
 MAP;
 
 # dialect: snowflake
-MAP_CONTAINS_KEY('k1', CAST(OBJECT_CONSTRUCT('k1', 'v1', 'k2', 'v2', 'k3', 'v3') AS MAP(VARCHAR, VARCHAR)));
+MAP_CONTAINS_KEY('k1', CAST(col AS MAP(VARCHAR, VARCHAR)));
 BOOLEAN;
 
 # dialect: snowflake
-MAP_DELETE(CAST(OBJECT_CONSTRUCT('a', '1', 'b', '2', 'c', '3') AS MAP(VARCHAR, VARCHAR)), 'b');
+MAP_DELETE(CAST(col AS MAP(VARCHAR, VARCHAR)), 'b');
 MAP;
 
 # dialect: snowflake
-MAP_INSERT(CAST(OBJECT_CONSTRUCT('a', '1') AS MAP(VARCHAR, VARCHAR)), 'b', '2');
+MAP_INSERT(CAST(col AS MAP(VARCHAR, VARCHAR)), 'b', '2');
 MAP;
 
 # dialect: snowflake
-MAP_KEYS(CAST(OBJECT_CONSTRUCT('a', '1', 'b', '2') AS MAP(VARCHAR, VARCHAR)));
+MAP_KEYS(CAST(col AS MAP(VARCHAR, VARCHAR)));
 ARRAY;
 
 # dialect: snowflake
-MAP_PICK(CAST(OBJECT_CONSTRUCT('a', '1', 'b', '2', 'c', '3') AS MAP(VARCHAR, VARCHAR)), 'a', 'c');
+MAP_PICK(CAST(col AS MAP(VARCHAR, VARCHAR)), 'a', 'c');
 MAP;
 
 # dialect: snowflake
-MAP_SIZE(CAST(OBJECT_CONSTRUCT('a', '1', 'b', '2') AS MAP(VARCHAR, VARCHAR)));
+MAP_SIZE(CAST(col AS MAP(VARCHAR, VARCHAR)));
 INT;
 
 # dialect: snowflake