Skip to content

fix: strip sqlcommenter tags from formattedQuery #105

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
veksen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: strip sqlcommenter tags from formattedQuery #105

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
6 changes: 6 additions & 0 deletions src/sql/recent-query.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,12 @@ test("analyze produces a RecentQuery with formatted query and analysis", async (
expect(rq.tableReferences.some((ref) => ref.table === "users")).toBe(true);
});

test("analyze strips sqlcommenter tags from formattedQuery", async () => {
const query = "SELECT id FROM users /*traceparent='00-abc123'*/";
const rq = await RecentQuery.analyze(makeRawQuery({ query }), testHash, 2000);
expect(rq.formattedQuery).toBe("SELECT\n id\nFROM\n users ");
});

test("analyze throws on unparseable SQL", async () => {
const data = makeRawQuery({ query: "THIS IS NOT VALID SQL AT ALL !!!" });
await expect(
Expand Down
4 changes: 2 additions & 2 deletions src/sql/recent-query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ export class RecentQuery {
const formattedQuery = await RecentQuery.formatQuery(
data.query,
);
const analysis = await analyzer.analyze(formattedQuery);
const analysis = await analyzer.analyze(data.query, formattedQuery);
const query = this.rewriteQuery(analysis.queryWithoutTags);
return new RecentQuery(
{ ...data, query, formattedQuery },
{ ...data, query, formattedQuery: analysis.formattedQueryWithoutTags ?? formattedQuery },
analysis.referencedTables,
analysis.indexesToCheck,
analysis.tags,
Expand Down
Loading