Skip to content

fix(pretty-print): keep qualified names in ALTER ... SET SCHEMA and RENAME #827

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
psteinroe merged 1 commit into from
Oct 2, 2026
Merged

fix(pretty-print): keep qualified names in ALTER ... SET SCHEMA and RENAME #827

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: 5 additions & 1 deletion crates/pgls_pretty_print/src/nodes/alter_object_schema_stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,11 @@ pub(super) fn emit_alter_object_schema_stmt(e: &mut EventEmitter, n: &AlterObjec
super::emit_node(object, e);
}
}
_ => super::emit_node(object, e),
_ => match &object.node {
// Qualified names (`any_name`) arrive as a list of strings
Some(NodeEnum::List(list)) => emit_dot_separated_list(e, &list.items),
_ => super::emit_node(object, e),
},
}
}

Expand Down
25 changes: 21 additions & 4 deletions crates/pgls_pretty_print/src/nodes/rename_stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use pgls_query::{
NodeEnum,
protobuf::{ObjectType, RenameStmt},
protobuf::{DropBehavior, ObjectType, RenameStmt},
};

use crate::{
Expand Down Expand Up @@ -77,8 +77,17 @@ pub(super) fn emit_rename_stmt(e: &mut EventEmitter, n: &RenameStmt) {
emit_keyworded_rename(e, TokenKind::CONSTRAINT_KW, &n.subname, &n.newname);
}
ObjectType::ObjectAttribute => {
emit_object_head(e, n);
// The composite type name is stored as a RangeVar in `relation`; it is not an
// inheritance target, so ONLY must not be emitted
if let Some(ref relation) = n.relation {
e.space();
super::emit_range_var_name(e, relation);
}
emit_attribute_rename(e, &n.subname, &n.newname);
if matches!(n.behavior(), DropBehavior::DropCascade) {
e.space();
e.token(TokenKind::CASCADE_KW);
}
}
ObjectType::ObjectAggregate => {
emit_aggregate_head(e, n);
Expand Down Expand Up @@ -238,7 +247,15 @@ fn emit_relation_head(e: &mut EventEmitter, n: &RenameStmt) {
fn emit_object_head(e: &mut EventEmitter, n: &RenameStmt) {
if let Some(ref object) = n.object {
e.space();
emit_node(object, e);
emit_object_name(e, object);
}
}

fn emit_object_name(e: &mut EventEmitter, object: &pgls_query::Node) {
match &object.node {
// Qualified names (`any_name`) arrive as a list of strings
Some(NodeEnum::List(list)) => emit_dot_separated_list(e, &list.items),
_ => emit_node(object, e),
}
}

Expand All @@ -248,7 +265,7 @@ fn emit_default_head(e: &mut EventEmitter, n: &RenameStmt) {
emit_range_var(e, relation);
} else if let Some(ref object) = n.object {
e.space();
emit_node(object, e);
emit_object_name(e, object);
} else if !n.subname.is_empty() {
e.space();
emit_identifier_maybe_quoted(e, &n.subname);
Expand Down
1 change: 1 addition & 0 deletions crates/pgls_pretty_print/tests/data/single/alter_object_schema_stmt_1.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
alter domain alter1.posint set schema alter2;
1 change: 1 addition & 0 deletions crates/pgls_pretty_print/tests/data/single/alter_object_schema_stmt_2.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
alter text search configuration alter1.cfg set schema alter2;
1 change: 1 addition & 0 deletions crates/pgls_pretty_print/tests/data/single/rename_stmt_1.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TYPE test_type2 RENAME ATTRIBUTE a TO aa CASCADE;
1 change: 1 addition & 0 deletions crates/pgls_pretty_print/tests/data/single/rename_stmt_2.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TYPE public.test_type RENAME ATTRIBUTE d TO dd;
1 change: 1 addition & 0 deletions crates/pgls_pretty_print/tests/data/single/rename_stmt_3.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER DOMAIN s.d RENAME CONSTRAINT c TO c2;
1 change: 1 addition & 0 deletions crates/pgls_pretty_print/tests/data/single/rename_stmt_4.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TEXT SEARCH CONFIGURATION s.cfg RENAME TO cfg2;
5 changes: 5 additions & 0 deletions crates/pgls_pretty_print/tests/snapshots/single/tests__alter_object_schema_stmt_1_100.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
source: crates/pgls_pretty_print/tests/tests.rs
input_file: crates/pgls_pretty_print/tests/data/single/alter_object_schema_stmt_1.sql
---
alter domain alter1.posint set schema alter2;
5 changes: 5 additions & 0 deletions crates/pgls_pretty_print/tests/snapshots/single/tests__alter_object_schema_stmt_1_80.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
source: crates/pgls_pretty_print/tests/tests.rs
input_file: crates/pgls_pretty_print/tests/data/single/alter_object_schema_stmt_1.sql
---
alter domain alter1.posint set schema alter2;
5 changes: 5 additions & 0 deletions crates/pgls_pretty_print/tests/snapshots/single/tests__alter_object_schema_stmt_2_100.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
source: crates/pgls_pretty_print/tests/tests.rs
input_file: crates/pgls_pretty_print/tests/data/single/alter_object_schema_stmt_2.sql
---
alter text search configuration alter1.cfg set schema alter2;
5 changes: 5 additions & 0 deletions crates/pgls_pretty_print/tests/snapshots/single/tests__alter_object_schema_stmt_2_80.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
source: crates/pgls_pretty_print/tests/tests.rs
input_file: crates/pgls_pretty_print/tests/data/single/alter_object_schema_stmt_2.sql
---
alter text search configuration alter1.cfg set schema alter2;
5 changes: 5 additions & 0 deletions crates/pgls_pretty_print/tests/snapshots/single/tests__rename_stmt_1_100.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
source: crates/pgls_pretty_print/tests/tests.rs
input_file: crates/pgls_pretty_print/tests/data/single/rename_stmt_1.sql
---
alter type test_type2 rename attribute a to aa cascade;
5 changes: 5 additions & 0 deletions crates/pgls_pretty_print/tests/snapshots/single/tests__rename_stmt_1_80.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
source: crates/pgls_pretty_print/tests/tests.rs
input_file: crates/pgls_pretty_print/tests/data/single/rename_stmt_1.sql
---
alter type test_type2 rename attribute a to aa cascade;
5 changes: 5 additions & 0 deletions crates/pgls_pretty_print/tests/snapshots/single/tests__rename_stmt_2_100.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
source: crates/pgls_pretty_print/tests/tests.rs
input_file: crates/pgls_pretty_print/tests/data/single/rename_stmt_2.sql
---
alter type public.test_type rename attribute d to dd;
5 changes: 5 additions & 0 deletions crates/pgls_pretty_print/tests/snapshots/single/tests__rename_stmt_2_80.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
source: crates/pgls_pretty_print/tests/tests.rs
input_file: crates/pgls_pretty_print/tests/data/single/rename_stmt_2.sql
---
alter type public.test_type rename attribute d to dd;
5 changes: 5 additions & 0 deletions crates/pgls_pretty_print/tests/snapshots/single/tests__rename_stmt_3_100.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
source: crates/pgls_pretty_print/tests/tests.rs
input_file: crates/pgls_pretty_print/tests/data/single/rename_stmt_3.sql
---
alter domain s.d rename constraint c to c2;
5 changes: 5 additions & 0 deletions crates/pgls_pretty_print/tests/snapshots/single/tests__rename_stmt_3_80.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
source: crates/pgls_pretty_print/tests/tests.rs
input_file: crates/pgls_pretty_print/tests/data/single/rename_stmt_3.sql
---
alter domain s.d rename constraint c to c2;
5 changes: 5 additions & 0 deletions crates/pgls_pretty_print/tests/snapshots/single/tests__rename_stmt_4_100.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
source: crates/pgls_pretty_print/tests/tests.rs
input_file: crates/pgls_pretty_print/tests/data/single/rename_stmt_4.sql
---
alter text search configuration s.cfg rename to cfg2;
5 changes: 5 additions & 0 deletions crates/pgls_pretty_print/tests/snapshots/single/tests__rename_stmt_4_80.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
source: crates/pgls_pretty_print/tests/tests.rs
input_file: crates/pgls_pretty_print/tests/data/single/rename_stmt_4.sql
---
alter text search configuration s.cfg rename to cfg2;
Loading