iffyio commented on code in PR #1839:
URL:
https://github.com/apache/datafusion-sqlparser-rs/pull/1839#discussion_r2083356065
##########
src/parser/mod.rs:
##########
@@ -5203,19 +5203,79 @@ impl<'a> Parser<'a> {
let (name, args) = self.parse_create_function_name_and_params()?;
self.expect_keyword(Keyword::RETURNS)?;
- let return_type = Some(self.parse_data_type()?);
- self.expect_keyword_is(Keyword::AS)?;
+ let return_table = self.maybe_parse(|p| {
+ let return_table_name = p.parse_identifier()?;
+ let table_column_defs = if p.peek_keyword(Keyword::TABLE) {
+ match p.parse_data_type()? {
+ DataType::Table(t) => t,
+ _ => parser_err!(
+ "Expected table data type after TABLE keyword",
+ p.peek_token().span.start
+ )?,
+ }
+ } else {
+ parser_err!(
+ "Expected TABLE keyword after return type",
+ p.peek_token().span.start
+ )?
+ };
- let begin_token = self.expect_keyword(Keyword::BEGIN)?;
- let statements = self.parse_statement_list(&[Keyword::END])?;
- let end_token = self.expect_keyword(Keyword::END)?;
+ if table_column_defs.is_none()
+ || table_column_defs.clone().is_some_and(|tcd| tcd.is_empty())
+ {
+ parser_err!(
+ "Expected table column definitions after TABLE keyword",
+ p.peek_token().span.start
+ )?
+ }
- let function_body =
Some(CreateFunctionBody::AsBeginEnd(BeginEndStatements {
- begin_token: AttachedToken(begin_token),
- statements,
- end_token: AttachedToken(end_token),
- }));
+ Ok(DataType::NamedTable(
+
ObjectName(vec![ObjectNamePart::Identifier(return_table_name)]),
+ table_column_defs.clone().unwrap(),
+ ))
+ })?;
+
+ let return_type = if return_table.is_some() {
+ return_table
+ } else {
+ Some(self.parse_data_type()?)
+ };
+
+ let _ = self.parse_keyword(Keyword::AS);
+
+ let function_body = if self.peek_keyword(Keyword::BEGIN) {
+ let begin_token = self.expect_keyword(Keyword::BEGIN)?;
+ let statements = self.parse_statement_list(&[Keyword::END])?;
+ let end_token = self.expect_keyword(Keyword::END)?;
+
+ Some(CreateFunctionBody::AsBeginEnd(BeginEndStatements {
+ begin_token: AttachedToken(begin_token),
+ statements,
+ end_token: AttachedToken(end_token),
+ }))
+ } else if self.parse_keyword(Keyword::RETURN) {
+ if self.peek_token() == Token::LParen {
+ let expr = self.parse_expr()?;
+ if !matches!(expr, Expr::Subquery(_)) {
+ parser_err!(
+ "Expected a subquery after RETURN",
+ self.peek_token().span.start
+ )?
+ }
+ Some(CreateFunctionBody::AsReturnSubquery(expr))
Review Comment:
```suggestion
Some(CreateFunctionBody::AsReturnExpr(expr))
```
thinking since a subquery is already an expr, we can be more permissive here?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For additional commands, e-mail: github-h...@datafusion.apache.org
