fix: close delimiter gaps left by concat merges and dedupe re-exports

PRs #14, #15, and #16 each added new AST types that collide in the
same places in src/ast/ddl.rs, src/ast/mod.rs, src/parser/mod.rs,
and tests/sqlparser_postgres.rs. Several mid-match-arm and
mid-function-body concat resolutions during the three rebase-and-merge
passes left fn / impl / match blocks missing their closing braces
and left the ddl re-export list with duplicate entries.

This restores compile:
- Adds missing closing braces for CastFunctionKind, StatisticsKind,
  CreateRule / CreateStatistics / CreateEventTrigger / CreateTransform /
  CreateLanguage Display impls and parse fns, plus the CreateTransform
  From-to-Statement impl.
- Dedupes and alphabetizes the `pub use self::ddl::{ ... }` list in
  src/ast/mod.rs.
- Adds missing doc comments on CastFunctionKind fields and RuleEvent
  variants that #[warn(missing_docs)] requires.

Unblocks 0.60.10 publish.

Author: fmguerreiro

src/ast/ddl.rs

@@ -6522,7 +6522,10 @@ impl From<CreateSubscription> for crate::ast::Statement {
 pub enum CastFunctionKind {
     /// `WITH FUNCTION function_name(arg_types)`
     WithFunction {
+        /// The name of the cast implementation function.
         function_name: ObjectName,
+        /// Optional argument type list. Empty if the function has no arguments
+        /// declared in the `CREATE CAST` clause.
         argument_types: Vec<DataType>,
     },
     /// `WITHOUT FUNCTION`
@@ -6546,6 +6549,10 @@ impl fmt::Display for CastFunctionKind {
             }
             CastFunctionKind::WithoutFunction => write!(f, "WITHOUT FUNCTION"),
             CastFunctionKind::WithInout => write!(f, "WITH INOUT"),
+        }
+    }
+}
+
 /// A kind of extended statistics collected by `CREATE STATISTICS`.
 ///
 /// Note: this is a PostgreSQL-specific concept.
@@ -6568,6 +6575,10 @@ impl fmt::Display for StatisticsKind {
             StatisticsKind::NDistinct => write!(f, "ndistinct"),
             StatisticsKind::Dependencies => write!(f, "dependencies"),
             StatisticsKind::Mcv => write!(f, "mcv"),
+        }
+    }
+}
+
 /// The object kind targeted by a `SECURITY LABEL` statement.
 ///
 /// See <https://www.postgresql.org/docs/current/sql-securitylabel.html>
@@ -6767,6 +6778,11 @@ impl fmt::Display for CreateLanguage {
         }
         if let Some(validator) = &self.validator {
             write!(f, " VALIDATOR {validator}")?;
+        }
+        Ok(())
+    }
+}
+
 /// A `CREATE STATISTICS` statement.
 ///
 /// Note: this is a PostgreSQL-specific statement.
@@ -6799,6 +6815,10 @@ impl fmt::Display for CreateStatistics {
         }
         write!(f, " ON {}", display_comma_separated(&self.on))?;
         write!(f, " FROM {}", self.from)?;
+        Ok(())
+    }
+}
+
 /// A `SECURITY LABEL` statement.
 ///
 /// Note: this is a PostgreSQL-specific statement.
@@ -6918,9 +6938,13 @@ impl From<CreateLanguage> for crate::ast::Statement {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
 pub enum RuleEvent {
+    /// `ON SELECT` rule.
     Select,
+    /// `ON INSERT` rule.
     Insert,
+    /// `ON UPDATE` rule.
     Update,
+    /// `ON DELETE` rule.
     Delete,
 }
 
@@ -6931,6 +6955,10 @@ impl fmt::Display for RuleEvent {
             RuleEvent::Insert => write!(f, "INSERT"),
             RuleEvent::Update => write!(f, "UPDATE"),
             RuleEvent::Delete => write!(f, "DELETE"),
+        }
+    }
+}
+
 impl From<CreateStatistics> for crate::ast::Statement {
     fn from(v: CreateStatistics) -> Self {
         crate::ast::Statement::CreateStatistics(v)
@@ -7042,6 +7070,9 @@ impl fmt::Display for CreateRule {
 impl From<CreateRule> for crate::ast::Statement {
     fn from(v: CreateRule) -> Self {
         crate::ast::Statement::CreateRule(v)
+    }
+}
+
 /// A `CREATE ACCESS METHOD` statement.
 ///
 /// Note: this is a PostgreSQL-specific statement.
@@ -7137,6 +7168,10 @@ impl fmt::Display for CreateEventTrigger {
             "FUNCTION"
         };
         write!(f, " EXECUTE {func_kw} {}()", self.execute)?;
+        Ok(())
+    }
+}
+
 impl From<CreateUserMapping> for crate::ast::Statement {
     fn from(v: CreateUserMapping) -> Self {
         crate::ast::Statement::CreateUserMapping(v)
@@ -7248,6 +7283,9 @@ impl fmt::Display for CreateTransform {
 impl From<CreateTransform> for crate::ast::Statement {
     fn from(v: CreateTransform) -> Self {
         crate::ast::Statement::CreateTransform(v)
+    }
+}
+
 impl From<CreateTablespace> for crate::ast::Statement {
     fn from(v: CreateTablespace) -> Self {
         crate::ast::Statement::CreateTablespace(v)

src/ast/mod.rs

@@ -60,45 +60,37 @@ pub use self::dcl::{
     SetConfigValue, Use,
 };
 pub use self::ddl::{
-    Alignment, AlterCollation, AlterCollationOperation, AlterColumnOperation, AlterConnectorOwner,
-    AlterDomain, AlterDomainOperation, AlterExtension, AlterExtensionOperation,
-    AlterFunction, AlterFunctionAction, AlterFunctionKind, AlterFunctionOperation,
-    AlterIndexOperation, AlterOperator, AlterOperatorClass, AlterOperatorClassOperation,
-    AlterOperatorFamily, AlterOperatorFamilyOperation, AlterOperatorOperation, AlterPolicy,
-    AlterPolicyOperation, AlterSchema, AlterSchemaOperation, AlterTable, AlterTableAlgorithm,
-    AlterTableLock, AlterTableOperation, AlterTableType, AlterTrigger, AlterTriggerOperation,
-    AlterType, AlterTypeAddValue,
-    AlterTypeAddValuePosition, AlterTypeOperation, AlterTypeRename, AlterTypeRenameValue,
-    AggregateModifyKind, CastContext, CastFunctionKind, ClusteredBy, ColumnDef, ColumnOption,
-    ColumnOptionDef, ColumnOptions,
-    ColumnPolicy, ColumnPolicyProperty, ConstraintCharacteristics, CreateAggregate,
+    AccessMethodType, AggregateModifyKind, Alignment, AlterCollation, AlterCollationOperation,
+    AlterColumnOperation, AlterConnectorOwner, AlterDomain, AlterDomainOperation, AlterExtension,
+    AlterExtensionOperation, AlterFunction, AlterFunctionAction, AlterFunctionKind,
+    AlterFunctionOperation, AlterIndexOperation, AlterOperator, AlterOperatorClass,
+    AlterOperatorClassOperation, AlterOperatorFamily, AlterOperatorFamilyOperation,
+    AlterOperatorOperation, AlterPolicy, AlterPolicyOperation, AlterSchema, AlterSchemaOperation,
+    AlterTable, AlterTableAlgorithm, AlterTableLock, AlterTableOperation, AlterTableType,
+    AlterTrigger, AlterTriggerOperation, AlterType, AlterTypeAddValue, AlterTypeAddValuePosition,
+    AlterTypeOperation, AlterTypeRename, AlterTypeRenameValue, CastContext, CastFunctionKind,
+    ClusteredBy, ColumnDef, ColumnOption, ColumnOptionDef, ColumnOptions, ColumnPolicy,
+    ColumnPolicyProperty, ConstraintCharacteristics, CreateAccessMethod, CreateAggregate,
     CreateAggregateOption, CreateCast, CreateCollation, CreateCollationDefinition, CreateConnector,
-    CreateConversion, CreateDomain, CreateExtension, CreateForeignDataWrapper, CreateForeignTable,
-    CreateFunction, CreateIndex, CreateLanguage, CreateOperator, CreateOperatorClass,
-    CreateOperatorFamily, CreatePolicy, CreatePolicyCommand, CreatePolicyType, CreatePublication,
-    CreateRule, CreateSubscription, CreateTable,
-    CreateTextSearchConfiguration, CreateTextSearchDictionary, CreateTextSearchParser,
-    CreateTextSearchTemplate, CreateTrigger, PublicationTarget, RuleAction, RuleEvent,
-    CreateAggregateOption, CreateCollation, CreateCollationDefinition, CreateConnector,
-    CreateDomain, CreateExtension, CreateForeignDataWrapper, CreateForeignTable, CreateFunction,
-    CreateIndex, CreateOperator, CreateOperatorClass, CreateOperatorFamily, CreatePolicy,
-    CreatePolicyCommand, CreatePolicyType, CreatePublication, CreateSubscription, CreateTable,
-    AccessMethodType, CreateAccessMethod, CreateEventTrigger, CreateStatistics, CreateTablespace,
-    CreateTextSearchConfiguration, CreateTextSearchDictionary, CreateTextSearchParser,
-    CreateTextSearchTemplate, CreateTransform, CreateTrigger, CreateUserMapping,
-    EventTriggerEvent, PublicationTarget, SecurityLabel, SecurityLabelObjectKind, StatisticsKind,
-    TransformElement, UserMappingUser,
-    CreateView, Deduplicate, DeferrableInitial, DistStyle, DropBehavior, DropExtension,
-    DropFunction, DropOperator, DropOperatorClass, DropOperatorFamily, DropOperatorSignature,
-    DropPolicy, DropTrigger, FdwRoutineClause, ForValues, 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,
-    TagsColumnOption, TriggerObjectKind, Truncate, UserDefinedTypeCompositeAttributeDef,
-    UserDefinedTypeInternalLength, UserDefinedTypeRangeOption, UserDefinedTypeRepresentation,
-    UserDefinedTypeSqlDefinitionOption, UserDefinedTypeStorage, ViewColumnDef,
+    CreateConversion, CreateDomain, CreateEventTrigger, CreateExtension, CreateForeignDataWrapper,
+    CreateForeignTable, CreateFunction, CreateIndex, CreateLanguage, CreateOperator,
+    CreateOperatorClass, CreateOperatorFamily, CreatePolicy, CreatePolicyCommand, CreatePolicyType,
+    CreatePublication, CreateRule, CreateStatistics, CreateSubscription, CreateTable,
+    CreateTablespace, CreateTextSearchConfiguration, CreateTextSearchDictionary,
+    CreateTextSearchParser, CreateTextSearchTemplate, CreateTransform, CreateTrigger,
+    CreateUserMapping, CreateView, Deduplicate, DeferrableInitial, DistStyle, DropBehavior,
+    DropExtension, DropFunction, DropOperator, DropOperatorClass, DropOperatorFamily,
+    DropOperatorSignature, DropPolicy, DropTrigger, EventTriggerEvent, FdwRoutineClause, ForValues,
+    FunctionReturnType, GeneratedAs, GeneratedExpressionMode, IdentityParameters, IdentityProperty,
+    IdentityPropertyFormatKind, IdentityPropertyKind, IdentityPropertyOrder, IndexColumn,
+    IndexOption, IndexType, KeyOrIndexDisplay, Msck, NullsDistinctOption, OperatorArgTypes,
+    OperatorClassItem, OperatorFamilyDropItem, OperatorFamilyItem, OperatorOption, OperatorPurpose,
+    Owner, Partition, PartitionBoundValue, ProcedureParam, PublicationTarget, ReferentialAction,
+    RenameTableNameKind, ReplicaIdentity, RuleAction, RuleEvent, SecurityLabel,
+    SecurityLabelObjectKind, StatisticsKind, TagsColumnOption, TransformElement, TriggerObjectKind,
+    Truncate, UserDefinedTypeCompositeAttributeDef, UserDefinedTypeInternalLength,
+    UserDefinedTypeRangeOption, UserDefinedTypeRepresentation, UserDefinedTypeSqlDefinitionOption,
+    UserDefinedTypeStorage, UserMappingUser, ViewColumnDef
 };
 pub use self::dml::{
     Delete, Insert, Merge, MergeAction, MergeClause, MergeClauseKind, MergeInsertExpr,

src/parser/mod.rs

@@ -20501,6 +20501,9 @@ impl<'a> Parser<'a> {
             condition,
             instead,
             action,
+        })
+    }
+
     /// Parse a `CREATE STATISTICS` statement.
     ///
     /// See <https://www.postgresql.org/docs/current/sql-createstatistics.html>