Skip to content

Fix(mssql): Properly quote table and views when dropping in mssql #4773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
themisvaltinos merged 3 commits into from
Jun 20, 2025
Merged

Fix(mssql): Properly quote table and views when dropping in mssql #4773

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
215ceae
Fix(mssql): Properly quote table and views when dropping in mssql
themisvaltinos Jun 20, 2025
2dacc34
use table_ instead
themisvaltinos Jun 20, 2025
f27089f
fix correct name
themisvaltinos Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions sqlmesh/core/engine_adapter/mssql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,15 +172,24 @@ def drop_schema(
if cascade:
objects = self._get_data_objects(schema_name)
for obj in objects:
# Build properly quoted table for MSSQL using square brackets when needed
object_name = ".".join(
[
exp.to_identifier(obj.schema_name).sql(self.dialect),
exp.to_identifier(obj.name).sql(self.dialect),
]
)
object_table = exp.to_table(object_name, dialect=self.dialect)
Comment thread
themisvaltinos marked this conversation as resolved.
Outdated

# _get_data_objects is catalog-specific, so these can't accidentally drop view/tables in another catalog
if obj.type == DataObjectType.VIEW:
self.drop_view(
".".join([obj.schema_name, obj.name]),
object_table,
ignore_if_not_exists=ignore_if_not_exists,
)
else:
self.drop_table(
".".join([obj.schema_name, obj.name]),
object_table,
exists=ignore_if_not_exists,
)
super().drop_schema(schema_name, ignore_if_not_exists=ignore_if_not_exists, cascade=False)
Expand Down
30 changes: 30 additions & 0 deletions tests/core/engine_adapter/test_mssql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,36 @@ def test_drop_schema(make_mocked_engine_adapter: t.Callable):
]


def test_drop_schema_with_special_identifiers(make_mocked_engine_adapter: t.Callable):
adapter = make_mocked_engine_adapter(MSSQLEngineAdapter)

adapter._get_data_objects = mock.Mock()
adapter._get_data_objects.return_value = [
DataObject(
catalog="test_catalog",
schema="test schema", # Schema with space
name="test view", # Object with space
type=DataObjectType.from_str("VIEW"),
),
DataObject(
catalog="test_catalog",
schema="test schema",
name="test table", # Table with space
type=DataObjectType.from_str("TABLE"),
),
]

schema_name = exp.to_table("[test schema]", dialect="tsql")
adapter.drop_schema(schema_name, cascade=True)

# Validate that names with spaces/special chars are properly quoted with square brackets
assert to_sql_calls(adapter) == [
"""DROP VIEW IF EXISTS [test schema].[test view];""",
"""DROP TABLE IF EXISTS [test schema].[test table];""",
"""DROP SCHEMA IF EXISTS [test schema];""",
]


def test_df_dates(make_mocked_engine_adapter: t.Callable):
adapter = make_mocked_engine_adapter(MSSQLEngineAdapter)

Expand Down