Skip to content

Fix Redshift parenthesized single-column SORTKEY #5915

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

Open
simen-strand wants to merge 4 commits into
base: main
Choose a base branch
from
+21 −5
Open

Fix Redshift parenthesized single-column SORTKEY #5915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1952387
Fix Redshift parenthesized single-column SORTKEY
simen-strand Jul 23, 2026
246a203
Merge branch 'main' into fix/redshift-single-column-sortkey
simen-strand Jul 24, 2026
33f88eb
Merge branch 'main' into fix/redshift-single-column-sortkey
simen-strand Sep 29, 2026
663a0a2
Test all Redshift sortkey forms in model physical_properties
simen-strand Sep 29, 2026
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
7 changes: 6 additions & 1 deletion sqlmesh/core/engine_adapter/redshift.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,12 @@ def _to_identifier_if_string(expression: exp.Expr) -> exp.Expr:

sortkey = table_properties.get("SORTKEY")
if sortkey:
sortkey_expressions = sortkey.expressions if sortkey.expressions else [sortkey]
if isinstance(sortkey, (exp.Tuple, exp.Array)):
sortkey_expressions = sortkey.expressions
elif isinstance(sortkey, exp.Paren):
sortkey_expressions = [sortkey.unnest()]
else:
sortkey_expressions = [sortkey]
properties.append(
exp.SortKeyProperty(
this=[
Expand Down
19 changes: 15 additions & 4 deletions tests/core/engine_adapter/test_redshift.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,22 +152,33 @@ def test_create_table_physical_properties_with_string_columns(
]


@pytest.mark.parametrize(
"sortkey, expected_sortkey",
[
('"batch_time"', 'SORTKEY("batch_time")'),
("batch_time", 'SORTKEY("batch_time")'),
('("batch_time")', 'SORTKEY("batch_time")'),
("(batch_time)", 'SORTKEY("batch_time")'),
('("batch_time", "id_file")', 'SORTKEY("batch_time", "id_file")'),
('["batch_time", "id_file"]', 'SORTKEY("batch_time", "id_file")'),
],
)
def test_create_table_physical_properties_from_model_definition(
make_mocked_engine_adapter: t.Callable,
make_mocked_engine_adapter: t.Callable, sortkey: str, expected_sortkey: str
):
adapter = make_mocked_engine_adapter(RedshiftEngineAdapter)
model: SqlModel = t.cast(
SqlModel,
load_sql_based_model(
d.parse(
"""
f"""
MODEL (
name test_schema.test_table,
kind full,
physical_properties (
diststyle = key,
distkey = "id_file",
sortkey = "batch_time"
sortkey = {sortkey}
)
);
SELECT id_file::INT, batch_time::TIMESTAMP;
Expand All @@ -183,7 +194,7 @@ def test_create_table_physical_properties_from_model_definition(
)

assert to_sql_calls(adapter) == [
'CREATE TABLE IF NOT EXISTS "test_schema"."test_table" ("id_file" INTEGER, "batch_time" TIMESTAMP) DISTSTYLE KEY DISTKEY("id_file") SORTKEY("batch_time")',
f'CREATE TABLE IF NOT EXISTS "test_schema"."test_table" ("id_file" INTEGER, "batch_time" TIMESTAMP) DISTSTYLE KEY DISTKEY("id_file") {expected_sortkey}',
]


Expand Down
Loading