Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions fuzz/fuzz_seeds/postgres_alter_extension.sql
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ ALTER EXTENSION citext ADD TABLESPACE ts;
ALTER EXTENSION citext ADD FUNCTION public.f(IN a int, text);
ALTER EXTENSION citext DROP PROCEDURE public.p(int);
ALTER EXTENSION citext ADD ROUTINE public.r(int);
ALTER EXTENSION citext DROP AGGREGATE agg(int ORDER BY text);
ALTER EXTENSION citext ADD AGGREGATE cnt(*);
3 changes: 3 additions & 0 deletions src/ast/ddl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4932,6 +4932,8 @@ pub enum AlterExtensionOperation {
pub enum AlterExtensionMember {
/// `ACCESS METHOD object_name`
AccessMethod(Ident),
/// `AGGREGATE aggregate_name ( aggregate_signature )`
Aggregate(AggregateSignature),
/// `COLLATION object_name`
Collation(ObjectName),
/// `CONVERSION object_name`
Expand Down Expand Up @@ -5016,6 +5018,7 @@ impl fmt::Display for AlterExtensionMember {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self {
AlterExtensionMember::AccessMethod(name) => write!(f, "ACCESS METHOD {name}"),
AlterExtensionMember::Aggregate(signature) => write!(f, "AGGREGATE {signature}"),
AlterExtensionMember::Collation(name) => write!(f, "COLLATION {name}"),
AlterExtensionMember::Conversion(name) => write!(f, "CONVERSION {name}"),
AlterExtensionMember::Database(name) => write!(f, "DATABASE {name}"),
Expand Down
4 changes: 4 additions & 0 deletions src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12532,6 +12532,10 @@ impl<'a> Parser<'a> {
fn parse_alter_extension_member(&mut self) -> Result<AlterExtensionMember, ParserError> {
if self.parse_keywords(&[Keyword::ACCESS, Keyword::METHOD]) {
Ok(AlterExtensionMember::AccessMethod(self.parse_identifier()?))
} else if self.parse_keyword(Keyword::AGGREGATE) {
Ok(AlterExtensionMember::Aggregate(
self.parse_alter_aggregate_signature()?,
))
} else if self.parse_keyword(Keyword::COLLATION) {
Ok(AlterExtensionMember::Collation(
self.parse_object_name(false)?,
Expand Down
33 changes: 33 additions & 0 deletions tests/sqlparser_postgres.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13535,6 +13535,12 @@ fn parse_case_ending_in_end_keyword_is_not_silently_dropped() {
fn alter_extension_member_round_trip_forms(action: &str) {
let sqls = [
format!("ALTER EXTENSION ext_name {action} ACCESS METHOD btree"),
format!("ALTER EXTENSION ext_name {action} AGGREGATE agg(*)"),
format!("ALTER EXTENSION ext_name {action} AGGREGATE agg(INT)"),
format!("ALTER EXTENSION ext_name {action} AGGREGATE agg(INT, TEXT)"),
format!("ALTER EXTENSION ext_name {action} AGGREGATE agg(IN INT)"),
format!("ALTER EXTENSION ext_name {action} AGGREGATE agg(ORDER BY TEXT)"),
format!("ALTER EXTENSION ext_name {action} AGGREGATE agg(INT ORDER BY TEXT)"),
format!("ALTER EXTENSION ext_name {action} COLLATION en_US"),
format!("ALTER EXTENSION ext_name {action} COLLATION schema.en_US"),
format!("ALTER EXTENSION ext_name {action} CONVERSION conv"),
Expand Down Expand Up @@ -13712,6 +13718,23 @@ fn parse_alter_extension_add_member() {
other => panic!("unexpected statement: {other:?}"),
}

assert_eq!(
pg_and_generic()
.verified_stmt("ALTER EXTENSION ext_name ADD AGGREGATE agg(INT ORDER BY TEXT)"),
Statement::AlterExtension(AlterExtension {
name: Ident::new("ext_name"),
operation: AlterExtensionOperation::Add(AlterExtensionMember::Aggregate(
AggregateSignature {
name: ObjectName::from(Ident::new("agg")),
args: AggregateArgs::List {
args: vec![OperateFunctionArg::unnamed(DataType::Int(None))],
order_by: Some(vec![OperateFunctionArg::unnamed(DataType::Text)]),
},
},
)),
})
);

match pg_and_generic().verified_stmt("ALTER EXTENSION ext_name ADD FUNCTION f(INT)") {
Statement::AlterExtension(AlterExtension {
operation: AlterExtensionOperation::Add(AlterExtensionMember::Function(function)),
Expand Down Expand Up @@ -13752,6 +13775,10 @@ fn parse_alter_extension_add_member() {
"ALTER EXTENSION ext_name ADD SCHEMA a.b",
"Expected: end of statement, found: .",
),
(
"ALTER EXTENSION ext_name ADD AGGREGATE agg",
"Expected: (, found: EOF",
),
(
"ALTER EXTENSION ext_name ADD FUNCTION 1",
"Expected: identifier, found: 1",
Expand Down Expand Up @@ -13933,3 +13960,9 @@ fn parse_alter_aggregate_signatures() {
);
}
}

#[test]
fn display_alter_extension_aggregate_propagates_write_errors() {
let statement = pg().verified_stmt("ALTER EXTENSION ext_name ADD AGGREGATE agg(*)");
assert_display_propagates_write_errors(&statement, &["AGGREGATE "]);
}
Loading