-
Notifications
You must be signed in to change notification settings - Fork 1.9k
fix(clickhouse): coerce LIMIT before SQL interpolation #2627
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.
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
Closed
+82
−0
Closed
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
654545d
fix(clickhouse): coerce LIMIT before SQL interpolation
Bartok9 eebb5ad
fix(clickhouse): reject fractional negative limits before int() trunc…
Bartok9 6c3053a
test(clickhouse): reject negative Decimal/Fraction limits
Bartok9 a9773cc
test(clickhouse): hoist Decimal/Fraction imports to module top (ruff …
Bartok9 2c8a436
style(clickhouse): ruff-format coerce_limit negative gate
Bartok9 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| """ClickHouse query must coerce LIMIT before SQL interpolation.""" | ||
|
|
||
| from __future__ import annotations | ||
|
|
||
| from unittest.mock import MagicMock, patch | ||
|
|
||
| import pytest | ||
|
|
||
| from wren.connector import clickhouse as ch_mod | ||
|
|
||
|
|
||
| def _connector(): | ||
| c = object.__new__(ch_mod.ClickHouseConnector) | ||
| c.connection = MagicMock() | ||
| c._closed = False | ||
| return c | ||
|
|
||
|
|
||
| def test_reject_negative_limit(): | ||
| c = _connector() | ||
| with pytest.raises(ValueError, match="non-negative"): | ||
| c.query("SELECT 1", limit=-1) | ||
|
|
||
|
|
||
| def test_reject_fractional_negative_limit(): | ||
| # ``int(-0.5)`` truncates to ``0``; ensure the fractional negative is | ||
| # rejected before truncation rather than silently becoming ``LIMIT 0``. | ||
| c = _connector() | ||
| with pytest.raises(ValueError, match="non-negative"): | ||
| c.query("SELECT 1", limit=-0.5) | ||
|
|
||
|
|
||
| def test_reject_injection_string(): | ||
| c = _connector() | ||
| with pytest.raises(ValueError): | ||
| c.query("SELECT 1", limit="1; DROP TABLE t") | ||
|
|
||
|
|
||
| def test_numeric_string_limit_interpolated(): | ||
| c = _connector() | ||
| with patch.object(ch_mod, "_build_clickhouse_arrow_table", return_value="tbl"): | ||
| out = c.query("SELECT 1", limit="7") | ||
| assert out == "tbl" | ||
| statement = c.connection.query.call_args[0][0] | ||
| assert "LIMIT 7" in statement | ||
| assert "DROP" not in statement |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.