-
Notifications
You must be signed in to change notification settings - Fork 1.9k
fix(mdl): skip non-dict models/columns/views in CTERewriter #2572
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
Closed
Changes from all commits
Commits
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,66 @@ | ||
| """CTERewriter must skip non-dict models/columns/views without TypeError.""" | ||
|
|
||
| from __future__ import annotations | ||
|
|
||
| import base64 | ||
| from types import SimpleNamespace | ||
|
|
||
| import orjson | ||
| import pytest | ||
|
|
||
| from wren.mdl.cte_rewriter import CTERewriter | ||
| from wren.model.data_source import DataSource | ||
|
|
||
| pytestmark = pytest.mark.unit | ||
|
|
||
|
|
||
| def _b64(manifest: dict) -> str: | ||
| return base64.b64encode(orjson.dumps(manifest)).decode() | ||
|
|
||
|
|
||
| def _rewriter(manifest: dict) -> CTERewriter: | ||
| session = SimpleNamespace() | ||
| return CTERewriter(_b64(manifest), session, DataSource.postgres, fallback=True) | ||
|
|
||
|
|
||
| def test_skips_nonduct_models_and_views() -> None: | ||
| manifest = { | ||
| "catalog": "wren", | ||
| "schema": "public", | ||
| "models": [ | ||
| "bad", | ||
| None, | ||
| { | ||
| "name": "orders", | ||
| "columns": [ | ||
| "x", | ||
| None, | ||
| {"name": "id", "type": "integer"}, | ||
| {"name": "", "type": "integer"}, | ||
| {"isHidden": True, "name": "secret"}, | ||
| ], | ||
| }, | ||
| {"name": 123, "columns": []}, | ||
| ], | ||
| "views": [ | ||
| "nope", | ||
| {"name": "v_ok", "statement": "SELECT 1"}, | ||
| {"name": "", "statement": "SELECT 2"}, | ||
| ], | ||
| } | ||
| rw = _rewriter(manifest) | ||
| assert list(rw.model_dict) == ["orders"] | ||
| assert rw._model_cols["orders"] == ["id"] | ||
| assert list(rw.view_dict) == ["v_ok"] | ||
|
|
||
|
|
||
| def test_iter_model_column_names_tolerates_bad_columns() -> None: | ||
| names = list( | ||
| CTERewriter._iter_model_column_names( | ||
| { | ||
| "name": "t", | ||
| "columns": ["x", {"name": "a"}, {"name": "b", "isHidden": True}], | ||
| } | ||
| ) | ||
| ) | ||
| assert names == ["a"] |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🩺 Stability & Availability | 🟠 Major | ⚡ Quick win
Apply the valid-name filter to collision scans.
Initialization skips models whose
nameis missing, empty, or non-string, but the case-collision scans still process those dicts. A discarded model containing visibleYear/yearcolumns can therefore activate case-sensitive mode, or reach_raise_case_collision()and fail atmodel['name']withKeyError.Use the same name predicate in both scans and interpolate the validated local name in the error message.
Proposed fix
for model in self.manifest.get("models", []): if not isinstance(model, dict): continue + model_name = model.get("name") + if not isinstance(model_name, str) or not model_name: + continueAlso applies to: 242-244
🤖 Prompt for AI Agents