Skip to content

Fix CTE recognition after INSERT columns and preserve enclosing indentation #414

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

Fix CTE recognition after INSERT columns and preserve enclosing indentation #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5678573
Formatter: Preserve enclosing indentation across CTEs
arnodirlam Sep 18, 2026
7d761b5
Tests: Remove redundant CTE indentation cases
arnodirlam Sep 18, 2026
ee898b8
Merge branch 'master' into codex/fix-cte-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
23 changes: 14 additions & 9 deletions lib/pgFormatter/Beautify.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1863,7 +1863,10 @@ sub beautify {
and (
!defined $last
or
( $last ne ')' and $self->_next_token !~ /^(TIME|FUNCTION)/i )
( ( $last ne ')'
or ( $self->{'_current_sql_stmt'} eq 'INSERT'
and !$self->{'_parenthesis_level'} ) )
and $self->_next_token !~ /^(TIME|FUNCTION)/i )
)
)
{
Expand All @@ -1890,6 +1893,11 @@ sub beautify {
$self->{'no_break'} = 1
if ( uc( $self->_next_token ) eq 'ORDINALITY' );
}
# Sibling CTEs and the final query inherit the enclosing block's level.
if ( $self->{'_is_in_with'} == 1 and !$self->{'_parenthesis_level'} ) {
$self->{_cte_base_level} = $self->{'_level'};
$self->{_cte_base_stack} = [ @{ $self->{'_level_stack'} } ];
}
$self->{'_is_in_materialized'} = 0;
}
elsif ( $token =~ /^WITH$/i
Expand Down Expand Up @@ -2013,15 +2021,12 @@ sub beautify {
$self->{'_level'} = $self->{'_with_base_level'}
if ( $self->{'_with_base_level'} );
}
$self->_add_token($token);
if ( !$self->{'_is_in_operator'} ) {
$self->_reset_level( $token, $last );
# Same rationale for the continuation of the WITH clause
# (the next CTE after a comma, or the final query): resume
# at the WITH level, not at column 0.
$self->{'_level'} = $self->{'_with_base_level'}
if ( $self->{'_with_base_level'} );
if ( !$self->{'_is_in_operator'} and defined $self->{_cte_base_level} ) {
$self->_set_level( $self->{_cte_base_level}, $token, $last );
@{ $self->{'_level_stack'} } = @{ $self->{_cte_base_stack} };
$self->{'content'} .= $self->_indent if ( $self->{'_new_line'} );
}
$self->_add_token($token);
if ( $self->{'_is_in_with'} ) {
if ( defined $self->_next_token
&& $self->_next_token eq ',' )
Expand Down
29 changes: 29 additions & 0 deletions t/test-files/cte_indentation.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
INSERT INTO results (id)
WITH first_cte AS (SELECT 1 AS id),
second_cte AS (SELECT id FROM first_cte)
SELECT id FROM second_cte;

DO $$
BEGIN
IF TRUE THEN
INSERT INTO results (id)
WITH first_cte AS (SELECT 1 AS id),
second_cte AS (SELECT id FROM first_cte)
SELECT id FROM second_cte;
ELSE
PERFORM 0;
END IF;
END
$$;

DO $$
BEGIN
IF TRUE THEN
WITH first_cte AS (SELECT 1 AS id),
second_cte AS (SELECT id FROM first_cte)
SELECT id FROM second_cte;
ELSE
PERFORM 0;
END IF;
END
$$;
65 changes: 65 additions & 0 deletions t/test-files/expected/cte_indentation.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
INSERT INTO results (id)
WITH first_cte AS (
SELECT
1 AS id
),
second_cte AS (
SELECT
id
FROM
first_cte
)
SELECT
id
FROM
second_cte;

DO $$
BEGIN
IF TRUE THEN
INSERT INTO results (id)
WITH first_cte AS (
SELECT
1 AS id
),
second_cte AS (
SELECT
id
FROM
first_cte
)
SELECT
id
FROM
second_cte;
ELSE
PERFORM
0;
END IF;
END
$$;

DO $$
BEGIN
IF TRUE THEN
WITH first_cte AS (
SELECT
1 AS id
),
second_cte AS (
SELECT
id
FROM
first_cte
)
SELECT
id
FROM
second_cte;
ELSE
PERFORM
0;
END IF;
END
$$;