Skip to content

fix(mssql): update SQL keywords to uppercase for consistency #4795

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
izeigerman merged 3 commits into from
Jun 24, 2025
Merged

fix(mssql): update SQL keywords to uppercase for consistency #4795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
858459d
fix(mssql): update SQL keywords to uppercase for consistency
mattiasthalen Jun 23, 2025
a211ab5
fix(mssql): Restore test_mssql.py
mattiasthalen Jun 24, 2025
24bf21f
fix(mssql): Update mssql tests
mattiasthalen Jun 24, 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
22 changes: 11 additions & 11 deletions sqlmesh/core/engine_adapter/mssql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,18 +90,18 @@ def columns(

sql = (
exp.select(
"column_name",
"data_type",
"character_maximum_length",
"numeric_precision",
"numeric_scale",
"COLUMN_NAME",
"DATA_TYPE",
"CHARACTER_MAXIMUM_LENGTH",
"NUMERIC_PRECISION",
"NUMERIC_SCALE",
)
.from_("information_schema.columns")
.where(f"table_name = '{table.name}'")
.from_("INFORMATION_SCHEMA.COLUMNS")
.where(f"TABLE_NAME = '{table.name}'")
)
database_name = table.db
if database_name:
sql = sql.where(f"table_schema = '{database_name}'")
sql = sql.where(f"TABLE_SCHEMA = '{database_name}'")

columns_raw = self.fetchall(sql, quote_identifiers=True)

Expand Down Expand Up @@ -145,12 +145,12 @@ def table_exists(self, table_name: TableName) -> bool:

sql = (
exp.select("1")
.from_("information_schema.tables")
.where(f"table_name = '{table.alias_or_name}'")
.from_("INFORMATION_SCHEMA.TABLES")
.where(f"TABLE_NAME = '{table.alias_or_name}'")
)
database_name = table.db
if database_name:
sql = sql.where(f"table_schema = '{database_name}'")
sql = sql.where(f"TABLE_SCHEMA = '{database_name}'")

result = self.fetchone(sql, quote_identifiers=True)

Expand Down
8 changes: 4 additions & 4 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 @@ -79,7 +79,7 @@ def test_columns(adapter: MSSQLEngineAdapter):
}

adapter.cursor.execute.assert_called_once_with(
"""SELECT [column_name], [data_type], [character_maximum_length], [numeric_precision], [numeric_scale] FROM [information_schema].[columns] WHERE [table_name] = 'table' AND [table_schema] = 'db';"""
"""SELECT [COLUMN_NAME], [DATA_TYPE], [CHARACTER_MAXIMUM_LENGTH], [NUMERIC_PRECISION], [NUMERIC_SCALE] FROM [INFORMATION_SCHEMA].[COLUMNS] WHERE [TABLE_NAME] = 'table' AND [TABLE_SCHEMA] = 'db';"""
)


Expand Down Expand Up @@ -149,8 +149,8 @@ def test_table_exists(make_mocked_engine_adapter: t.Callable):
resp = adapter.table_exists("db.table")
adapter.cursor.execute.assert_called_once_with(
"""SELECT 1 """
"""FROM [information_schema].[tables] """
"""WHERE [table_name] = 'table' AND [table_schema] = 'db';"""
"""FROM [INFORMATION_SCHEMA].[TABLES] """
"""WHERE [TABLE_NAME] = 'table' AND [TABLE_SCHEMA] = 'db';"""
)
assert resp
adapter.cursor.fetchone.return_value = None
Expand Down Expand Up @@ -506,7 +506,7 @@ def test_replace_query(make_mocked_engine_adapter: t.Callable):
adapter.replace_query("test_table", parse_one("SELECT a FROM tbl"), {"a": "int"})

assert to_sql_calls(adapter) == [
"""SELECT 1 FROM [information_schema].[tables] WHERE [table_name] = 'test_table';""",
"""SELECT 1 FROM [INFORMATION_SCHEMA].[TABLES] WHERE [TABLE_NAME] = 'test_table';""",
"TRUNCATE TABLE [test_table];",
"INSERT INTO [test_table] ([a]) SELECT [a] FROM [tbl];",
]
Expand Down