fix!: tsql drop view no catalog

tobymao · May 9, 2024 · 9338ebc · 9338ebc
1 parent 0927ae3
commit 9338ebc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/sqlglot/dialects/tsql.py b/sqlglot/dialects/tsql.py
@@ -1058,3 +1058,8 @@ def altertable_sql(self, expression: exp.AlterTable) -> str:
             if isinstance(action, exp.RenameTable):
                 return f"EXEC sp_rename '{self.sql(expression.this)}', '{action.this.name}'"
             return super().altertable_sql(expression)
+
+        def drop_sql(self, expression: exp.Drop) -> str:
+            if expression.args["kind"] == "VIEW":
+                expression.this.set("catalog", None)
+            return super().drop_sql(expression)
diff --git a/sqlglot/parser.py b/sqlglot/parser.py
@@ -1521,7 +1521,7 @@ def _parse_drop(self, exists: bool = False) -> exp.Drop | exp.Command:
             exists=if_exists,
             this=table,
             expressions=expressions,
-            kind=kind,
+            kind=kind.upper(),
             temporary=temporary,
             materialized=materialized,
             cascade=self._match_text_seq("CASCADE"),

diff --git a/tests/dialects/test_snowflake.py b/tests/dialects/test_snowflake.py
@@ -1195,7 +1195,7 @@ def test_ddl(self):
         self.validate_identity("CREATE TABLE IDENTIFIER('foo') (COLUMN1 VARCHAR, COLUMN2 VARCHAR)")
         self.validate_identity("CREATE TABLE IDENTIFIER($foo) (col1 VARCHAR, col2 VARCHAR)")
         self.validate_identity(
-            "DROP function my_udf (OBJECT(city VARCHAR, zipcode DECIMAL, val ARRAY(BOOLEAN)))"
+            "DROP FUNCTION my_udf (OBJECT(city VARCHAR, zipcode DECIMAL, val ARRAY(BOOLEAN)))"
         )
         self.validate_identity(
             "CREATE TABLE orders_clone_restore CLONE orders AT (TIMESTAMP => TO_TIMESTAMP_TZ('04/05/2013 01:02:03', 'mm/dd/yyyy hh24:mi:ss'))"

diff --git a/tests/dialects/test_tsql.py b/tests/dialects/test_tsql.py
@@ -8,6 +8,7 @@ class TestTSQL(Validator):
     dialect = "tsql"
 
     def test_tsql(self):
+        self.validate_identity("DROP view a.b.c", "DROP VIEW b.c")
         self.validate_identity("ROUND(x, 1, 0)")
         self.validate_identity("EXEC MyProc @id=7, @name='Lochristi'", check_command_warning=True)
         # https://learn.microsoft.com/en-us/previous-versions/sql/sql-server-2008-r2/ms187879(v=sql.105)?redirectedfrom=MSDN