Skip to content

fix(pretty-print): quote reserved-keyword and mixed-case identifiers across all emitters #755

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 2 commits into from
Jun 3, 2026
Merged

fix(pretty-print): quote reserved-keyword and mixed-case identifiers across all emitters #755

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
171497e
fix(pretty-print): quote reserved-keyword and mixed-case identifiert …
JohannesKnopp Jun 2, 2026
0cc65cb
add further test cases and fixes for potentially quoted reserved keyw…
JohannesKnopp Jun 3, 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
4 changes: 2 additions & 2 deletions crates/pgls_pretty_print/src/nodes/alias.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub(super) fn emit_alias(e: &mut EventEmitter, n: &Alias) {

e.token(TokenKind::AS_KW);
e.space();
e.token(TokenKind::IDENT(n.aliasname.clone()));
super::emit_identifier_maybe_quoted(e, &n.aliasname);

// Add column aliases if present
if !n.colnames.is_empty() {
Expand All @@ -24,7 +24,7 @@ pub(super) fn emit_alias(e: &mut EventEmitter, n: &Alias) {
emit_comma_separated_list(e, &n.colnames, |node, e| {
// Column names in alias are String nodes
if let Some(pgls_query::NodeEnum::String(s)) = node.node.as_ref() {
e.token(TokenKind::IDENT(s.sval.clone()));
super::emit_identifier_maybe_quoted(e, &s.sval);
} else {
super::emit_node(node, e);
}
Expand Down
2 changes: 1 addition & 1 deletion crates/pgls_pretty_print/src/nodes/alter_database_refresh_coll_stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pub(super) fn emit_alter_database_refresh_coll_stmt(
e.space();

if !n.dbname.is_empty() {
e.token(TokenKind::IDENT(n.dbname.clone()));
super::emit_identifier_maybe_quoted(e, &n.dbname);
}

e.line(LineType::SoftOrSpace);
Expand Down
2 changes: 1 addition & 1 deletion crates/pgls_pretty_print/src/nodes/alter_database_set_stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pub(super) fn emit_alter_database_set_stmt(e: &mut EventEmitter, n: &AlterDataba
e.space();

if !n.dbname.is_empty() {
e.token(TokenKind::IDENT(n.dbname.clone()));
super::emit_identifier_maybe_quoted(e, &n.dbname);
}

if let Some(ref setstmt) = n.setstmt {
Expand Down
2 changes: 1 addition & 1 deletion crates/pgls_pretty_print/src/nodes/alter_database_stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub(super) fn emit_alter_database_stmt(e: &mut EventEmitter, n: &AlterDatabaseSt
e.space();

if !n.dbname.is_empty() {
e.token(TokenKind::IDENT(n.dbname.clone()));
super::emit_identifier_maybe_quoted(e, &n.dbname);
}

if !n.options.is_empty() {
Expand Down
4 changes: 2 additions & 2 deletions crates/pgls_pretty_print/src/nodes/alter_domain_stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ pub(super) fn emit_alter_domain_stmt(e: &mut EventEmitter, n: &AlterDomainStmt)
}
if !n.name.is_empty() {
e.space();
e.token(TokenKind::IDENT(n.name.clone()));
super::emit_identifier_maybe_quoted(e, &n.name);
}
// behavior: 0=Undefined, 1=DropRestrict, 2=DropCascade
// Only emit CASCADE explicitly; RESTRICT is the default
Expand All @@ -87,7 +87,7 @@ pub(super) fn emit_alter_domain_stmt(e: &mut EventEmitter, n: &AlterDomainStmt)
e.token(TokenKind::CONSTRAINT_KW);
if !n.name.is_empty() {
e.space();
e.token(TokenKind::IDENT(n.name.clone()));
super::emit_identifier_maybe_quoted(e, &n.name);
}
}
_ => {
Expand Down
2 changes: 1 addition & 1 deletion crates/pgls_pretty_print/src/nodes/alter_event_trig_stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub(super) fn emit_alter_event_trig_stmt(e: &mut EventEmitter, n: &AlterEventTri
e.space();

if !n.trigname.is_empty() {
e.token(TokenKind::IDENT(n.trigname.clone()));
super::emit_identifier_maybe_quoted(e, &n.trigname);
}

e.space();
Expand Down
2 changes: 1 addition & 1 deletion crates/pgls_pretty_print/src/nodes/alter_extension_contents_stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pub(super) fn emit_alter_extension_contents_stmt(
e.space();

if !n.extname.is_empty() {
e.token(TokenKind::IDENT(n.extname.clone()));
super::emit_identifier_maybe_quoted(e, &n.extname);
}

e.line(LineType::SoftOrSpace);
Expand Down
2 changes: 1 addition & 1 deletion crates/pgls_pretty_print/src/nodes/alter_extension_stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub(super) fn emit_alter_extension_stmt(e: &mut EventEmitter, n: &AlterExtension
e.space();

if !n.extname.is_empty() {
e.token(TokenKind::IDENT(n.extname.clone()));
super::emit_identifier_maybe_quoted(e, &n.extname);
}

if !n.options.is_empty() {
Expand Down
2 changes: 1 addition & 1 deletion crates/pgls_pretty_print/src/nodes/alter_fdw_stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub(super) fn emit_alter_fdw_stmt(e: &mut EventEmitter, n: &AlterFdwStmt) {
e.space();

if !n.fdwname.is_empty() {
e.token(TokenKind::IDENT(n.fdwname.clone()));
super::emit_identifier_maybe_quoted(e, &n.fdwname);
}

// Handler/validator functions in func_options - space-separated, not comma-separated
Expand Down
2 changes: 1 addition & 1 deletion crates/pgls_pretty_print/src/nodes/alter_object_depends_stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ pub(super) fn emit_alter_object_depends_stmt(e: &mut EventEmitter, n: &AlterObje

if let Some(ref extname) = n.extname {
e.space();
e.token(TokenKind::IDENT(extname.sval.clone()));
super::emit_identifier_maybe_quoted(e, &extname.sval);
}

e.token(TokenKind::SEMICOLON);
Expand Down
2 changes: 1 addition & 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 @@ -123,7 +123,7 @@ pub(super) fn emit_alter_object_schema_stmt(e: &mut EventEmitter, n: &AlterObjec
e.space();
e.token(TokenKind::SCHEMA_KW);
e.space();
e.token(TokenKind::IDENT(n.newschema.clone()));
super::emit_identifier_maybe_quoted(e, &n.newschema);
}

e.token(TokenKind::SEMICOLON);
Expand Down
2 changes: 1 addition & 1 deletion crates/pgls_pretty_print/src/nodes/alter_op_family_stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub(super) fn emit_alter_op_family_stmt(e: &mut EventEmitter, n: &AlterOpFamilyS
e.space();

if !n.amname.is_empty() {
e.token(TokenKind::IDENT(n.amname.clone()));
super::emit_identifier_maybe_quoted(e, &n.amname);
}

// Use indent and soft line break for ADD/DROP clause
Expand Down
2 changes: 1 addition & 1 deletion crates/pgls_pretty_print/src/nodes/alter_publication_stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pub(super) fn emit_alter_publication_stmt(e: &mut EventEmitter, n: &AlterPublica

// Publication name
if !n.pubname.is_empty() {
e.token(TokenKind::IDENT(n.pubname.clone()));
super::emit_identifier_maybe_quoted(e, &n.pubname);
}

// action: 0=Undefined, 1=AP_AddObjects, 2=AP_DropObjects, 3=AP_SetObjects
Expand Down
2 changes: 1 addition & 1 deletion crates/pgls_pretty_print/src/nodes/alter_role_set_stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub(super) fn emit_alter_role_set_stmt(e: &mut EventEmitter, n: &AlterRoleSetStm
e.space();
e.token(TokenKind::DATABASE_KW);
e.space();
e.token(TokenKind::IDENT(n.database.clone()));
super::emit_identifier_maybe_quoted(e, &n.database);
}

// The SET/RESET statement
Expand Down
4 changes: 2 additions & 2 deletions crates/pgls_pretty_print/src/nodes/alter_table_move_all_stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pub(super) fn emit_alter_table_move_all_stmt(e: &mut EventEmitter, n: &AlterTabl
e.space();
e.token(TokenKind::TABLESPACE_KW);
e.space();
e.token(TokenKind::IDENT(n.orig_tablespacename.clone()));
super::emit_identifier_maybe_quoted(e, &n.orig_tablespacename);

// Emit OWNED BY roles if specified
if !n.roles.is_empty() {
Expand All @@ -49,7 +49,7 @@ pub(super) fn emit_alter_table_move_all_stmt(e: &mut EventEmitter, n: &AlterTabl
e.space();
e.token(TokenKind::TABLESPACE_KW);
e.space();
e.token(TokenKind::IDENT(n.new_tablespacename.clone()));
super::emit_identifier_maybe_quoted(e, &n.new_tablespacename);

if n.nowait {
e.space();
Expand Down
Loading
Loading