fix(query): support CTE WITH queries, leading comments, and trailing semicolons in tabular query detection - #69
Merged
Conversation
…semicolons in tabular query detection is_tabular_query in handle_query classified queries by uppercasing the raw SQL and checking its literal prefix, which broke on: - a leading `-- comment` or `/* comment */` (misclassified as non-tabular, silently returning 0 columns/0 rows) - CTE `WITH ... SELECT` queries (`WITH` wasn't in the prefix list) - a trailing `;` (FORMAT was appended after it, producing a ClickHouse syntax error, since FORMAT must precede the statement terminator) Classify on strip_sql_comments_and_trim(trimmed_sql) instead of a raw uppercase, add WITH to the tabular prefix list, and strip trailing `;`/whitespace before appending the FORMAT clause. Closes #58
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
is_tabular_queryclassified queries by uppercasing the raw SQL and checking its literal prefix, which misclassified:-- commentor/* comment */as non-tabular (silently returning 0 columns/0 rows)WITH ... SELECTqueries as non-tabular (WITHwasn't in the prefix list);—FORMATwas appended after the semicolon, causing a ClickHouse syntax errorstrip_sql_comments_and_trim(trimmed_sql)(the same comment/string-aware normalizer already used for Safe Mode), addedWITHto the tabular prefix list, and strips trailing;/whitespace before appendingFORMAT JSONCompactEachRowWithNamesAndTypes.Closes #58