Skip to content

fix(redshift): strip trailing semicolon on unlimited query path #2482

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
goldmedal merged 1 commit into from
Jul 22, 2026
Merged

fix(redshift): strip trailing semicolon on unlimited query path #2482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions core/wren/src/wren/connector/redshift.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ def query(self, sql: str, limit: int | None = None) -> pa.Table:
f"SELECT * FROM ({_strip_trailing_semicolon(sql)}) "
f"AS _q LIMIT {int(limit)}"
)
else:
# Unlimited path also rejects trailing ``;`` for single statements
# depending on driver/session settings — strip for consistency.
sql = _strip_trailing_semicolon(sql)
with closing(self.connection.cursor()) as cursor:
cursor.execute(sql)
cols = [desc[0] for desc in cursor.description]
Expand Down
8 changes: 8 additions & 0 deletions core/wren/tests/unit/test_redshift_semicolon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,11 @@ def test_helper_preserves_semicolon_inside_string_literal() -> None:

def test_helper_no_trailing_semicolon_unchanged() -> None:
assert _strip_trailing_semicolon("SELECT 1") == "SELECT 1"


def test_query_without_limit_strips_trailing_semicolon() -> None:
connector, cursor = _make_mock_connector()
connector.query("SELECT 1;")
(sent,), _ = cursor.execute.call_args
assert sent == "SELECT 1"
assert not sent.endswith(";")
Loading