Skip to content

parens for complex stmts #151

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
pyramation merged 1 commit into from
Jun 23, 2025
Merged

parens for complex stmts #151

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
1 change: 1 addition & 0 deletions __fixtures__/generated/generated.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21097,6 +21097,7 @@
"misc/issues-11.sql": "COMMENT ON COLUMN \"foo\".\"whatever\" IS $$\nSomething blah, this data may have chars like '\\n' and '\\r' in it.\n$$",
"misc/issues-12.sql": "SELECT * from foo.bar.baz",
"misc/issues-13.sql": "CREATE AGGREGATE json_agg_strict(anyelement)(\n SFUNC = json_agg_strict_sfunc,\n STYPE = jsonb,\n FINALFUNC = json_agg_strict_finalfunc,\n INITCOND = '[]'\n)",
"misc/issues-14.sql": "SELECT (1 IS NOT NULL) IS DISTINCT FROM (2 IS NOT NULL)",
"misc/inflection-1.sql": "CREATE SCHEMA inflection",
"misc/inflection-2.sql": "GRANT USAGE ON SCHEMA inflection TO PUBLIC",
"misc/inflection-3.sql": "ALTER DEFAULT PRIVILEGES IN SCHEMA inflection \n GRANT EXECUTE ON FUNCTIONS TO PUBLIC",
Expand Down
5 changes: 4 additions & 1 deletion __fixtures__/kitchen-sink/misc/issues.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,7 @@ CREATE AGGREGATE json_agg_strict(anyelement)(
STYPE = jsonb,
FINALFUNC = json_agg_strict_finalfunc,
INITCOND = '[]'
);
);

-- https://github.com/launchql/pgsql-parser/issues/62
SELECT (1 IS NOT NULL) IS DISTINCT FROM (2 IS NOT NULL);
3 changes: 2 additions & 1 deletion packages/deparser/__tests__/kitchen-sink/misc-issues.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ it('misc-issues', async () => {
"misc/issues-10.sql",
"misc/issues-11.sql",
"misc/issues-12.sql",
"misc/issues-13.sql"
"misc/issues-13.sql",
"misc/issues-14.sql"
]);
});
36 changes: 30 additions & 6 deletions packages/deparser/src/deparser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,18 +438,42 @@ export class Deparser implements DeparserVisitor {
'ALL',
this.formatter.parens(this.visit(rexpr, context))
]);
case 'AEXPR_DISTINCT':
case 'AEXPR_DISTINCT': {
let leftExpr = this.visit(lexpr, context);
let rightExpr = this.visit(rexpr, context);

// Add parentheses for complex expressions
if (lexpr && this.isComplexExpression(lexpr)) {
leftExpr = this.formatter.parens(leftExpr);
}
if (rexpr && this.isComplexExpression(rexpr)) {
rightExpr = this.formatter.parens(rightExpr);
}

return this.formatter.format([
this.visit(lexpr, context),
leftExpr,
'IS DISTINCT FROM',
this.visit(rexpr, context)
rightExpr
]);
case 'AEXPR_NOT_DISTINCT':
}
case 'AEXPR_NOT_DISTINCT': {
let leftExpr = this.visit(lexpr, context);
let rightExpr = this.visit(rexpr, context);

// Add parentheses for complex expressions
if (lexpr && this.isComplexExpression(lexpr)) {
leftExpr = this.formatter.parens(leftExpr);
}
if (rexpr && this.isComplexExpression(rexpr)) {
rightExpr = this.formatter.parens(rightExpr);
}

return this.formatter.format([
this.visit(lexpr, context),
leftExpr,
'IS NOT DISTINCT FROM',
this.visit(rexpr, context)
rightExpr
]);
}
case 'AEXPR_NULLIF':
return this.formatter.format([
'NULLIF',
Expand Down