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
1 change: 1 addition & 0 deletions fuzz/fuzz_seeds/postgres_cte_cycle_mark_values.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
WITH RECURSIVE r (id) AS (SELECT 1 UNION ALL SELECT id + 1 FROM r) CYCLE id SET c TO 'Y' DEFAULT 'N' USING p SELECT id FROM r
40 changes: 20 additions & 20 deletions src/ast/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,26 +102,26 @@ pub use self::dml::{
};
pub use self::operator::{BinaryOperator, UnaryOperator};
pub use self::query::{
AfterMatchSkip, ConnectByKind, Cte, CteAsMaterialized, CteCycleClause, CteSearchClause,
CteSearchOrder, Distinct, EmptyMatchesMode, ExceptSelectItem, ExcludeSelectItem, ExprWithAlias,
ExprWithAliasAndOrderBy, Fetch, ForClause, ForJson, ForXml, FormatClause, GroupByExpr,
GroupByWithModifier, IdentWithAlias, IlikeSelectItem, InputFormatClause, Interpolate,
InterpolateExpr, Join, JoinConstraint, JoinOperator, JsonTableColumn,
JsonTableColumnErrorHandling, JsonTableNamedColumn, JsonTableNestedColumn, LateralView,
LimitClause, LockClause, LockType, MatchRecognizePattern, MatchRecognizeSymbol, Measure,
NamedWindowDefinition, NamedWindowExpr, NonBlock, Offset, OffsetRows, OpenJsonTableColumn,
OrderBy, OrderByExpr, OrderByKind, OrderByOptions, OrderBySort, PipeOperator, PivotValueSource,
ProjectionSelect, Query, RenameSelectItem, RepetitionQuantifier, ReplaceSelectElement,
ReplaceSelectItem, RowsPerMatch, Select, SelectFlavor, SelectInto, SelectItem,
SelectItemQualifiedWildcardKind, SelectModifiers, SetExpr, SetOperator, SetQuantifier, Setting,
SymbolDefinition, Table, TableAlias, TableAliasColumnDef, TableFactor, TableFunctionArgs,
TableIndexDirective, TableIndexHintForClause, TableIndexHintType, TableIndexHints,
TableIndexType, TableInheritance, TableSample, TableSampleBucket, TableSampleKind,
TableSampleMethod, TableSampleModifier, TableSampleQuantity, TableSampleSeed,
TableSampleSeedModifier, TableSampleUnit, TableVersion, TableWithJoins, Top, TopQuantity,
UpdateTableFromKind, ValueTableMode, Values, WildcardAdditionalOptions, With, WithFill,
XmlNamespaceDefinition, XmlPassingArgument, XmlPassingClause, XmlTableColumn,
XmlTableColumnOption,
AfterMatchSkip, ConnectByKind, Cte, CteAsMaterialized, CteCycleClause, CteCycleMarkValues,
CteSearchClause, CteSearchOrder, Distinct, EmptyMatchesMode, ExceptSelectItem,
ExcludeSelectItem, ExprWithAlias, ExprWithAliasAndOrderBy, Fetch, ForClause, ForJson, ForXml,
FormatClause, GroupByExpr, GroupByWithModifier, IdentWithAlias, IlikeSelectItem,
InputFormatClause, Interpolate, InterpolateExpr, Join, JoinConstraint, JoinOperator,
JsonTableColumn, JsonTableColumnErrorHandling, JsonTableNamedColumn, JsonTableNestedColumn,
LateralView, LimitClause, LockClause, LockType, MatchRecognizePattern, MatchRecognizeSymbol,
Measure, NamedWindowDefinition, NamedWindowExpr, NonBlock, Offset, OffsetRows,
OpenJsonTableColumn, OrderBy, OrderByExpr, OrderByKind, OrderByOptions, OrderBySort,
PipeOperator, PivotValueSource, ProjectionSelect, Query, RenameSelectItem,
RepetitionQuantifier, ReplaceSelectElement, ReplaceSelectItem, RowsPerMatch, Select,
SelectFlavor, SelectInto, SelectItem, SelectItemQualifiedWildcardKind, SelectModifiers,
SetExpr, SetOperator, SetQuantifier, Setting, SymbolDefinition, Table, TableAlias,
TableAliasColumnDef, TableFactor, TableFunctionArgs, TableIndexDirective,
TableIndexHintForClause, TableIndexHintType, TableIndexHints, TableIndexType, TableInheritance,
TableSample, TableSampleBucket, TableSampleKind, TableSampleMethod, TableSampleModifier,
TableSampleQuantity, TableSampleSeed, TableSampleSeedModifier, TableSampleUnit, TableVersion,
TableWithJoins, Top, TopQuantity, UpdateTableFromKind, ValueTableMode, Values,
WildcardAdditionalOptions, With, WithFill, XmlNamespaceDefinition, XmlPassingArgument,
XmlPassingClause, XmlTableColumn, XmlTableColumnOption,
};

pub use self::trigger::{
Expand Down
26 changes: 24 additions & 2 deletions src/ast/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ pub struct Cte {
pub closing_paren_token: AttachedToken,
/// Optional PostgreSQL `SEARCH { BREADTH | DEPTH } FIRST BY ... SET ...` clause.
pub search: Option<CteSearchClause>,
/// Optional PostgreSQL `CYCLE ... SET ... USING ...` clause.
/// Optional PostgreSQL `CYCLE ... SET ... [TO ... DEFAULT ...] USING ...` clause.
pub cycle: Option<CteCycleClause>,
}

Expand Down Expand Up @@ -906,7 +906,7 @@ impl fmt::Display for CteSearchOrder {
/// The `CYCLE` clause of a recursive CTE.
///
/// ```sql
/// CYCLE id SET is_cycle USING path
/// CYCLE id SET is_cycle TO 'Y' DEFAULT 'N' USING path
/// ```
///
/// [PostgreSQL](https://www.postgresql.org/docs/current/queries-with.html#QUERIES-WITH-CYCLE)
Expand All @@ -918,6 +918,8 @@ pub struct CteCycleClause {
pub columns: Vec<Ident>,
/// The cycle mark column after `SET`.
pub mark_column: Ident,
/// The optional `TO value DEFAULT value` pair.
pub mark_values: Option<CteCycleMarkValues>,
/// The path column after `USING`.
pub path_column: Ident,
}
Expand All @@ -930,10 +932,30 @@ impl fmt::Display for CteCycleClause {
display_comma_separated(&self.columns),
self.mark_column
)?;
if let Some(mark_values) = &self.mark_values {
write!(f, " {mark_values}")?;
}
write!(f, " USING {}", self.path_column)
}
}

/// The `TO value DEFAULT value` pair of a [`CteCycleClause`].
#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "visitor", derive(Visit, VisitMut))]
pub struct CteCycleMarkValues {
/// The value set on a row that closes a cycle.
pub value: Expr,
/// The value set on every other row.
pub default: Expr,
}

impl fmt::Display for CteCycleMarkValues {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "TO {} DEFAULT {}", self.value, self.default)
}
}

/// Represents an expression behind a wildcard expansion in a projection.
/// `SELECT T.* FROM T;
#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
Expand Down
6 changes: 6 additions & 0 deletions src/ast/spans.rs
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ impl Spanned for CteCycleClause {
let CteCycleClause {
columns,
mark_column,
mark_values,
path_column,
} = self;

Expand All @@ -251,6 +252,11 @@ impl Spanned for CteCycleClause {
.iter()
.map(|item| item.span)
.chain(core::iter::once(mark_column.span))
.chain(
mark_values
.iter()
.flat_map(|values| [values.value.span(), values.default.span()]),
)
.chain(core::iter::once(path_column.span)),
)
}
Expand Down
9 changes: 9 additions & 0 deletions src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16174,11 +16174,20 @@ impl<'a> Parser<'a> {
let columns = self.parse_comma_separated(|parser| parser.parse_identifier())?;
self.expect_keyword_is(Keyword::SET)?;
let mark_column = self.parse_identifier()?;
let mark_values = if self.parse_keyword(Keyword::TO) {
let value = self.parse_expr()?;
self.expect_keyword_is(Keyword::DEFAULT)?;
let default = self.parse_expr()?;
Some(CteCycleMarkValues { value, default })
} else {
None
};
self.expect_keyword_is(Keyword::USING)?;
let path_column = self.parse_identifier()?;
Ok(Some(CteCycleClause {
columns,
mark_column,
mark_values,
path_column,
}))
}
Expand Down
32 changes: 32 additions & 0 deletions tests/sqlparser_postgres.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13600,6 +13600,7 @@ fn parse_cte_cycle_clause() {
Some(CteCycleClause {
columns: vec![Ident::new("id")],
mark_column: Ident::new("is_cycle"),
mark_values: None,
path_column: Ident::new("path"),
})
);
Expand All @@ -13622,3 +13623,34 @@ fn parse_cte_cycle_clause() {
)],
);
}

#[test]
fn parse_cte_cycle_mark_values() {
pg_and_generic().verified_stmt(&format!(
"{RECURSIVE_GROUPS_CTE} CYCLE id, parent_id SET is_cycle TO true DEFAULT false USING path SELECT id FROM r"
));

let query = pg().verified_query(&format!(
"{RECURSIVE_GROUPS_CTE} CYCLE id SET is_cycle TO 'Y' DEFAULT 'N' USING path SELECT id FROM r"
));
assert_eq!(
query.with.unwrap().cte_tables[0].cycle,
Some(CteCycleClause {
columns: vec![Ident::new("id")],
mark_column: Ident::new("is_cycle"),
mark_values: Some(CteCycleMarkValues {
value: Expr::Value(Value::SingleQuotedString("Y".to_string()).with_empty_span()),
default: Expr::Value(Value::SingleQuotedString("N".to_string()).with_empty_span()),
}),
path_column: Ident::new("path"),
})
);

assert_recursive_cte_errors(
&pg(),
&[(
"CYCLE id SET is_cycle TO 'Y' USING path",
"Expected: DEFAULT, found: USING",
)],
);
}
Loading