diff --git a/fuzz/fuzz_seeds/postgres_alter_extension.sql b/fuzz/fuzz_seeds/postgres_alter_extension.sql index 815e00c1cb..d966f56be8 100644 --- a/fuzz/fuzz_seeds/postgres_alter_extension.sql +++ b/fuzz/fuzz_seeds/postgres_alter_extension.sql @@ -1,3 +1,4 @@ ALTER EXTENSION citext SET SCHEMA other; ALTER EXTENSION citext UPDATE; ALTER EXTENSION "uuid-ossp" UPDATE TO '1.1'; +ALTER EXTENSION citext ADD TABLE public.t; diff --git a/src/ast/ddl.rs b/src/ast/ddl.rs index 54324e69fa..3fa9a6ca58 100644 --- a/src/ast/ddl.rs +++ b/src/ast/ddl.rs @@ -4907,6 +4907,27 @@ pub enum AlterExtensionOperation { /// Target schema name. schema_name: ObjectName, }, + /// Add a member object to the extension. + /// + /// ```sql + /// ALTER EXTENSION name ADD member_object + /// ``` + Add(AlterExtensionMember), + /// Remove a member object from the extension. + /// + /// ```sql + /// ALTER EXTENSION name DROP member_object + /// ``` + Drop(AlterExtensionMember), +} + +/// Member objects that can be added to or removed from an extension. +#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)] +#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))] +pub enum AlterExtensionMember { + /// `TABLE object_name` + Table(ObjectName), } impl fmt::Display for AlterExtensionOperation { @@ -4922,6 +4943,16 @@ impl fmt::Display for AlterExtensionOperation { AlterExtensionOperation::SetSchema { schema_name } => { write!(f, "SET SCHEMA {schema_name}") } + AlterExtensionOperation::Add(member) => write!(f, "ADD {member}"), + AlterExtensionOperation::Drop(member) => write!(f, "DROP {member}"), + } + } +} + +impl fmt::Display for AlterExtensionMember { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + match self { + AlterExtensionMember::Table(name) => write!(f, "TABLE {name}"), } } } diff --git a/src/ast/mod.rs b/src/ast/mod.rs index b245770354..9e5e865c22 100644 --- a/src/ast/mod.rs +++ b/src/ast/mod.rs @@ -65,34 +65,35 @@ pub use self::dcl::{ }; pub use self::ddl::{ AggregateModifyKind, Alignment, AlterCollation, AlterCollationOperation, AlterColumnOperation, - AlterConnectorOwner, AlterExtension, AlterExtensionOperation, AlterFunction, - AlterFunctionAction, AlterFunctionKind, AlterFunctionOperation, AlterGenericOption, - AlterIndexOperation, AlterOperator, AlterOperatorClass, AlterOperatorClassOperation, - AlterOperatorFamily, AlterOperatorFamilyOperation, AlterOperatorOperation, AlterPolicy, - AlterPolicyOperation, AlterSchema, AlterSchemaOperation, AlterTable, AlterTableAlgorithm, - AlterTableLock, AlterTableOperation, AlterTableType, AlterTextSearch, AlterTextSearchOperation, - AlterTextSearchOption, AlterTrigger, AlterTriggerOperation, AlterType, AlterTypeAddValue, - AlterTypeAddValuePosition, AlterTypeOperation, AlterTypeRename, AlterTypeRenameValue, - AlterView, AlterViewOperation, ClusteredBy, ColumnDef, ColumnOption, ColumnOptionDef, - ColumnOptions, ColumnPolicy, ColumnPolicyProperty, ConstraintCharacteristics, CreateAggregate, - CreateAggregateArgs, CreateAggregateOption, CreateCollation, CreateCollationDefinition, - CreateConnector, CreateDomain, CreateExtension, CreateForeignDataWrapper, CreateForeignTable, - CreateFunction, CreateIndex, CreateOperator, CreateOperatorClass, CreateOperatorFamily, - CreatePolicy, CreatePolicyCommand, CreatePolicyType, CreateRule, CreateRuleAction, - CreateRuleDoKind, CreateRuleEvent, CreateTable, CreateTextSearch, CreateTrigger, - CreateUserMapping, CreateView, Deduplicate, DeferrableInitial, DetachPartitionMode, DistStyle, - DropBehavior, DropExtension, DropFunction, DropOperator, DropOperatorClass, DropOperatorFamily, - DropOperatorSignature, DropPolicy, DropRule, DropTrigger, ForValues, - ForeignDataWrapperRoutineClause, FunctionReturnType, GeneratedAs, GeneratedExpressionMode, - IdentityParameters, IdentityProperty, IdentityPropertyFormatKind, IdentityPropertyKind, - IdentityPropertyOrder, IndexColumn, IndexOption, IndexType, KeyOrIndexDisplay, Msck, - NullsDistinctOption, OperatorArgTypes, OperatorClassItem, OperatorFamilyDropItem, - OperatorFamilyItem, OperatorOption, OperatorPurpose, Owner, Partition, PartitionBoundValue, - ProcedureParam, ReferentialAction, RenameTableNameKind, ReplicaIdentity, SqliteTableOption, - SqliteTableOptions, TagsColumnOption, TextSearchObjectType, TriggerObjectKind, Truncate, - UserDefinedTypeCompositeAttributeDef, UserDefinedTypeInternalLength, - UserDefinedTypeRangeOption, UserDefinedTypeRepresentation, UserDefinedTypeSqlDefinitionOption, - UserDefinedTypeStorage, UserMappingUser, ViewColumnDef, WithData, + AlterConnectorOwner, AlterExtension, AlterExtensionMember, AlterExtensionOperation, + AlterFunction, AlterFunctionAction, AlterFunctionKind, AlterFunctionOperation, + AlterGenericOption, AlterIndexOperation, AlterOperator, AlterOperatorClass, + AlterOperatorClassOperation, AlterOperatorFamily, AlterOperatorFamilyOperation, + AlterOperatorOperation, AlterPolicy, AlterPolicyOperation, AlterSchema, AlterSchemaOperation, + AlterTable, AlterTableAlgorithm, AlterTableLock, AlterTableOperation, AlterTableType, + AlterTextSearch, AlterTextSearchOperation, AlterTextSearchOption, AlterTrigger, + AlterTriggerOperation, AlterType, AlterTypeAddValue, AlterTypeAddValuePosition, + AlterTypeOperation, AlterTypeRename, AlterTypeRenameValue, AlterView, AlterViewOperation, + ClusteredBy, ColumnDef, ColumnOption, ColumnOptionDef, ColumnOptions, ColumnPolicy, + ColumnPolicyProperty, ConstraintCharacteristics, CreateAggregate, CreateAggregateArgs, + CreateAggregateOption, CreateCollation, CreateCollationDefinition, CreateConnector, + CreateDomain, CreateExtension, CreateForeignDataWrapper, CreateForeignTable, CreateFunction, + CreateIndex, CreateOperator, CreateOperatorClass, CreateOperatorFamily, CreatePolicy, + CreatePolicyCommand, CreatePolicyType, CreateRule, CreateRuleAction, CreateRuleDoKind, + CreateRuleEvent, CreateTable, CreateTextSearch, CreateTrigger, CreateUserMapping, CreateView, + Deduplicate, DeferrableInitial, DetachPartitionMode, DistStyle, DropBehavior, DropExtension, + DropFunction, DropOperator, DropOperatorClass, DropOperatorFamily, DropOperatorSignature, + DropPolicy, DropRule, DropTrigger, ForValues, ForeignDataWrapperRoutineClause, + FunctionReturnType, GeneratedAs, GeneratedExpressionMode, IdentityParameters, IdentityProperty, + IdentityPropertyFormatKind, IdentityPropertyKind, IdentityPropertyOrder, IndexColumn, + IndexOption, IndexType, KeyOrIndexDisplay, Msck, NullsDistinctOption, OperatorArgTypes, + OperatorClassItem, OperatorFamilyDropItem, OperatorFamilyItem, OperatorOption, OperatorPurpose, + Owner, Partition, PartitionBoundValue, ProcedureParam, ReferentialAction, RenameTableNameKind, + ReplicaIdentity, SqliteTableOption, SqliteTableOptions, TagsColumnOption, TextSearchObjectType, + TriggerObjectKind, Truncate, UserDefinedTypeCompositeAttributeDef, + UserDefinedTypeInternalLength, UserDefinedTypeRangeOption, UserDefinedTypeRepresentation, + UserDefinedTypeSqlDefinitionOption, UserDefinedTypeStorage, UserMappingUser, ViewColumnDef, + WithData, }; pub use self::dml::{ Delete, Insert, InsertOverriding, Merge, MergeAction, MergeClause, MergeClauseKind, diff --git a/src/parser/mod.rs b/src/parser/mod.rs index 51d4c913a3..641346e3f8 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -12521,15 +12521,34 @@ impl<'a> Parser<'a> { schema_name: self.parse_object_name(false)?, } } else { - return self.expected_ref( - "UPDATE or SET SCHEMA after ALTER EXTENSION name", - self.peek_token_ref(), - ); + let action = if self.parse_keyword(Keyword::ADD) { + AlterExtensionOperation::Add + } else if self.parse_keyword(Keyword::DROP) { + AlterExtensionOperation::Drop + } else { + return self.expected_ref( + "UPDATE, SET SCHEMA, ADD, or DROP after ALTER EXTENSION name", + self.peek_token_ref(), + ); + }; + action(self.parse_alter_extension_member()?) }; Ok(AlterExtension { name, operation }) } + /// Parse a member object of `ALTER EXTENSION ADD` or `ALTER EXTENSION DROP` + fn parse_alter_extension_member(&mut self) -> Result { + if self.parse_keyword(Keyword::TABLE) { + Ok(AlterExtensionMember::Table(self.parse_object_name(false)?)) + } else { + self.expected_ref( + "member object type after ADD or DROP", + self.peek_token_ref(), + ) + } + } + /// Parse a [Statement::AlterOperator] /// /// [PostgreSQL Documentation](https://www.postgresql.org/docs/current/sql-alteroperator.html) diff --git a/tests/sqlparser_postgres.rs b/tests/sqlparser_postgres.rs index bc8f8e7b34..730f3c5e83 100644 --- a/tests/sqlparser_postgres.rs +++ b/tests/sqlparser_postgres.rs @@ -13526,6 +13526,16 @@ 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} TABLE t"), + format!("ALTER EXTENSION ext_name {action} TABLE schema.t"), + ]; + for sql in sqls { + pg_and_generic().verified_stmt(&sql); + } +} + #[test] fn parse_alter_extension_update() { pg_and_generic().verified_stmt("ALTER EXTENSION ext_name UPDATE"); @@ -13559,7 +13569,7 @@ fn parse_alter_extension_update() { for (sql, error) in [ ( "ALTER EXTENSION ext_name", - "Expected: UPDATE or SET SCHEMA after ALTER EXTENSION name, found: EOF", + "Expected: UPDATE, SET SCHEMA, ADD, or DROP after ALTER EXTENSION name, found: EOF", ), ( "ALTER EXTENSION ext_name UPDATE TO", @@ -13642,3 +13652,68 @@ fn parse_alter_extension_set_schema() { ); } } + +#[test] +fn parse_alter_extension_add_member() { + alter_extension_member_round_trip_forms("ADD"); + + for (sql, error) in [ + ( + "ALTER EXTENSION ext_name ADD", + "Expected: member object type after ADD or DROP, found: EOF", + ), + ( + "ALTER EXTENSION ext_name ADD FOO bar", + "Expected: member object type after ADD or DROP, found: FOO", + ), + ] { + assert_eq!( + pg_and_generic().parse_sql_statements(sql).unwrap_err(), + ParserError::ParserError(error.to_string()), + "{sql}" + ); + } + + assert_eq!( + pg_and_generic() + .parse_sql_statements("ALTER EXTENSION ext_name ADD TABLE") + .unwrap_err(), + ParserError::ParserError("Expected: identifier, found: EOF".to_string()) + ); +} + +#[test] +fn parse_alter_extension_drop_member() { + alter_extension_member_round_trip_forms("DROP"); + + match pg_and_generic().verified_stmt("ALTER EXTENSION ext_name DROP TABLE schema.t") { + Statement::AlterExtension(AlterExtension { name, operation }) => { + assert_eq!(name, Ident::new("ext_name")); + assert_eq!( + operation, + AlterExtensionOperation::Drop(AlterExtensionMember::Table(ObjectName::from(vec![ + Ident::new("schema"), + Ident::new("t") + ]))) + ); + } + other => panic!("unexpected statement: {other:?}"), + } + + for (sql, error) in [ + ( + "ALTER EXTENSION ext_name DROP", + "Expected: member object type after ADD or DROP, found: EOF", + ), + ( + "ALTER EXTENSION ext_name DROP FOO bar", + "Expected: member object type after ADD or DROP, found: FOO", + ), + ] { + assert_eq!( + pg_and_generic().parse_sql_statements(sql).unwrap_err(), + ParserError::ParserError(error.to_string()), + "{sql}" + ); + } +}