iffyio commented on code in PR #1839:
URL:
https://github.com/apache/datafusion-sqlparser-rs/pull/1839#discussion_r2080647857
##########
src/ast/data_type.rs:
##########
@@ -716,7 +724,15 @@ impl fmt::Display for DataType {
DataType::Unspecified => Ok(()),
DataType::Trigger => write!(f, "TRIGGER"),
DataType::AnyType => write!(f, "ANY TYPE"),
- DataType::Table(fields) => write!(f, "TABLE({})",
display_comma_separated(fields)),
+ DataType::Table(fields) => {
+ if fields.is_empty() {
+ return write!(f, "TABLE");
+ }
+ write!(f, "TABLE({})", display_comma_separated(fields))
Review Comment:
I think instead of using the `is_empty` we can make the `fields` value an
`Option` and skip the parenthesis only if `fields` is `None`. Otherwise we
could run into issues if empty fields is allowed in the other variant of this
datatype
##########
src/parser/mod.rs:
##########
@@ -5203,19 +5203,73 @@ 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
+ )?
+ };
+ Ok(DataType::NamedTable(
+
ObjectName(vec![ObjectNamePart::Identifier(return_table_name)]),
+ table_column_defs.clone(),
+ ))
+ })?;
+
+ let return_type = if return_table.is_some() {
+ return_table
+ } else {
+ Some(self.parse_data_type()?)
+ };
- 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 self.peek_keyword(Keyword::AS) {
+ self.expect_keyword_is(Keyword::AS)?;
+ }
Review Comment:
```suggestion
self.parse_keyword(Keyword::AS);
```
this looks like it could be simplified as above?
##########
src/parser/mod.rs:
##########
@@ -5203,19 +5203,73 @@ 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
+ )?
+ };
+ Ok(DataType::NamedTable(
+
ObjectName(vec![ObjectNamePart::Identifier(return_table_name)]),
+ table_column_defs.clone(),
+ ))
+ })?;
+
+ let return_type = if return_table.is_some() {
+ return_table
+ } else {
+ Some(self.parse_data_type()?)
+ };
Review Comment:
Could this be included in the `maybe_parse()` logic above? such that the
logic returns both the return table and the datatype. based on this condition,
they seem to go hand in hand?
--
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
