Skip to content

Fix indentation of procedural IF EXISTS blocks #413

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
darold merged 2 commits into from
Sep 19, 2026
Merged

Fix indentation of procedural IF EXISTS blocks #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6938361
Formatter: Fix procedural IF EXISTS indentation
arnodirlam Sep 18, 2026
41fa571
Merge branch 'master' into codex/fix-if-exists-indentation
darold Sep 19, 2026
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
13 changes: 10 additions & 3 deletions lib/pgFormatter/Beautify.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3940,10 +3940,15 @@ sub beautify {
}
$self->{'no_break'} = 0;
if ( defined $self->_next_token
and $self->_next_token !~ /^(EXISTS|;)$/i )
and ( $self->_next_token !~ /^(EXISTS|;)$/i
or ( uc($self->_next_token) eq 'EXISTS'
and defined $self->{'_tokens'}->[1]
and $self->{'_tokens'}->[1] eq '(' ) ) )
{
if ( uc( $self->_next_token ) ne 'NOT'
|| uc( $self->{'_tokens'}->[1] ) ne 'EXISTS' )
|| uc( $self->{'_tokens'}->[1] ) ne 'EXISTS'
|| ( defined $self->{'_tokens'}->[2]
and $self->{'_tokens'}->[2] eq '(' ) )
{
$self->_new_line( $token, $last )
if ( $token =~ /^LOOP$/i );
Expand Down Expand Up @@ -4179,7 +4184,9 @@ sub beautify {
$self->{'_has_over_in_join'} = 1;
}
$self->{'_is_in_join'} = 0;
if ( !$self->{'_is_in_if'}
# Keep query predicates multiline inside procedural conditions.
if ( ( !$self->{'_is_in_if'}
or ( $self->{'_is_subquery'} and $self->{'_parenthesis_level'} ) )
and !$self->{'_is_in_index'}
and !$self->{'_is_in_merge'}
and ( not defined $last or $last !~ /^(?:CREATE)$/i )
Expand Down
16 changes: 8 additions & 8 deletions t/pg-test-files/expected/opr_sanity.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ BEGIN
AND casttarget = $2
AND castmethod = 'b'
AND castcontext = 'i') THEN
RETURN TRUE;
END IF;
RETURN TRUE;
END IF;
IF $2 = 'pg_catalog.any'::pg_catalog.regtype THEN
RETURN TRUE;
END IF;
Expand All @@ -53,9 +53,9 @@ END IF;
oid = $1
AND typelem != 0
AND typlen = -1) THEN
RETURN TRUE;
RETURN TRUE;
END IF;
END IF;
END IF;
IF $2 = 'pg_catalog.anyrange'::pg_catalog.regtype THEN
IF (
SELECT
Expand Down Expand Up @@ -93,8 +93,8 @@ BEGIN
castsource = $1
AND casttarget = $2
AND castmethod = 'b') THEN
RETURN TRUE;
END IF;
RETURN TRUE;
END IF;
IF $2 = 'pg_catalog.any'::pg_catalog.regtype THEN
RETURN TRUE;
END IF;
Expand All @@ -108,9 +108,9 @@ END IF;
oid = $1
AND typelem != 0
AND typlen = -1) THEN
RETURN TRUE;
RETURN TRUE;
END IF;
END IF;
END IF;
IF $2 = 'pg_catalog.anyrange'::pg_catalog.regtype THEN
IF (
SELECT
Expand Down
18 changes: 18 additions & 0 deletions t/test-files/ex85.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
-- Procedural existence checks must open an indentation level, unlike DDL guards.
DO $$
BEGIN
IF NOT EXISTS (SELECT 1 FROM widgets WHERE id = 1 AND enabled) THEN
IF EXISTS (SELECT 1 FROM other_widgets WHERE id = 1 OR id = 2) AND true THEN
EXECUTE $sql$SELECT 1;$sql$;
ELSE
RAISE NOTICE 'missing';
END IF;
ELSE
PERFORM 2;
END IF;
PERFORM 3;
END
$$;

CREATE TABLE IF NOT EXISTS widgets (id integer, enabled boolean);
DROP TABLE IF EXISTS widgets;
SELECT 'a'
'b' AS lit
FROM t;
Expand Down
38 changes: 38 additions & 0 deletions t/test-files/expected/ex85.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,41 @@
-- Procedural existence checks must open an indentation level, unlike DDL guards.
DO $$
BEGIN
IF NOT EXISTS (
SELECT
1
FROM
widgets
WHERE
id = 1
AND enabled) THEN
IF EXISTS (
SELECT
1
FROM
other_widgets
WHERE
id = 1
OR id = 2) AND TRUE THEN
EXECUTE $sql$SELECT 1;$sql$;
ELSE
RAISE NOTICE 'missing';
END IF;
ELSE
PERFORM
2;
END IF;
PERFORM
3;
END
$$;

CREATE TABLE IF NOT EXISTS widgets (
id integer,
enabled boolean
);

DROP TABLE IF EXISTS widgets;
SELECT
'a'
'b' AS lit
Expand Down
Loading