Skip to content

Support the ARRAY type of Snowflake #699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 4, 2022
Merged
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
10 changes: 8 additions & 2 deletions src/ast/data_type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ pub enum DataType {
/// Custom type such as enums
Custom(ObjectName, Vec<String>),
/// Arrays
Array(Box<DataType>),
Array(Option<Box<DataType>>),
/// Enums
Enum(Vec<String>),
/// Set
Expand Down Expand Up @@ -232,7 +232,13 @@ impl fmt::Display for DataType {
DataType::Text => write!(f, "TEXT"),
DataType::String => write!(f, "STRING"),
DataType::Bytea => write!(f, "BYTEA"),
DataType::Array(ty) => write!(f, "{}[]", ty),
DataType::Array(ty) => {
if let Some(t) = &ty {
write!(f, "{}[]", t)
} else {
write!(f, "ARRAY")
}
}
DataType::Custom(ty, modifiers) => {
if modifiers.is_empty() {
write!(f, "{}", ty)
Expand Down
20 changes: 12 additions & 8 deletions src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3672,13 +3672,17 @@ impl<'a> Parser<'a> {
Keyword::ENUM => Ok(DataType::Enum(self.parse_string_values()?)),
Keyword::SET => Ok(DataType::Set(self.parse_string_values()?)),
Keyword::ARRAY => {
// Hive array syntax. Note that nesting arrays - or other Hive syntax
// that ends with > will fail due to "C++" problem - >> is parsed as
// Token::ShiftRight
self.expect_token(&Token::Lt)?;
let inside_type = self.parse_data_type()?;
self.expect_token(&Token::Gt)?;
Ok(DataType::Array(Box::new(inside_type)))
if dialect_of!(self is SnowflakeDialect) {
Ok(DataType::Array(None))
} else {
// Hive array syntax. Note that nesting arrays - or other Hive syntax
// that ends with > will fail due to "C++" problem - >> is parsed as
// Token::ShiftRight
self.expect_token(&Token::Lt)?;
let inside_type = self.parse_data_type()?;
self.expect_token(&Token::Gt)?;
Ok(DataType::Array(Some(Box::new(inside_type))))
}
}
_ => {
self.prev_token();
Expand All @@ -3697,7 +3701,7 @@ impl<'a> Parser<'a> {
// Keyword::ARRAY syntax from above
while self.consume_token(&Token::LBracket) {
self.expect_token(&Token::RBracket)?;
data = DataType::Array(Box::new(data))
data = DataType::Array(Some(Box::new(data)))
}
Ok(data)
}
Expand Down
24 changes: 16 additions & 8 deletions tests/sqlparser_common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use sqlparser::ast::SelectItem::UnnamedExpr;
use sqlparser::ast::*;
use sqlparser::dialect::{
AnsiDialect, BigQueryDialect, ClickHouseDialect, GenericDialect, HiveDialect, MsSqlDialect,
PostgreSqlDialect, SQLiteDialect, SnowflakeDialect,
MySqlDialect, PostgreSqlDialect, SQLiteDialect, SnowflakeDialect,
};
use sqlparser::keywords::ALL_KEYWORDS;
use sqlparser::parser::{Parser, ParserError};
Expand Down Expand Up @@ -2099,7 +2099,7 @@ fn parse_create_table_hive_array() {
},
ColumnDef {
name: Ident::new("val"),
data_type: DataType::Array(Box::new(DataType::Int(None))),
data_type: DataType::Array(Some(Box::new(DataType::Int(None)))),
collation: None,
options: vec![],
},
Expand All @@ -2109,12 +2109,20 @@ fn parse_create_table_hive_array() {
_ => unreachable!(),
}

let res =
parse_sql_statements("CREATE TABLE IF NOT EXISTS something (name int, val array<int)");
assert!(res
.unwrap_err()
.to_string()
.contains("Expected >, found: )"));
// SnowflakeDialect using array diffrent
let dialects = TestedDialects {
dialects: vec![
Box::new(PostgreSqlDialect {}),
Box::new(HiveDialect {}),
Box::new(MySqlDialect {}),
],
};
let sql = "CREATE TABLE IF NOT EXISTS something (name int, val array<int)";

assert_eq!(
dialects.parse_sql_statements(sql).unwrap_err(),
ParserError::ParserError("Expected >, found: )".to_string())
);
}

#[test]
Expand Down
6 changes: 3 additions & 3 deletions tests/sqlparser_postgres.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1281,9 +1281,9 @@ fn parse_array_index_expr() {
})],
named: true,
})),
data_type: DataType::Array(Box::new(DataType::Array(Box::new(DataType::Int(
None
)))))
data_type: DataType::Array(Some(Box::new(DataType::Array(Some(Box::new(
DataType::Int(None)
))))))
}))),
indexes: vec![num[1].clone(), num[2].clone()],
},
Expand Down
13 changes: 13 additions & 0 deletions tests/sqlparser_snowflake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,19 @@ fn test_single_table_in_parenthesis_with_alias() {
);
}

#[test]
fn parse_array() {
let sql = "SELECT CAST(a AS ARRAY) FROM customer";
let select = snowflake().verified_only_select(sql);
assert_eq!(
&Expr::Cast {
expr: Box::new(Expr::Identifier(Ident::new("a"))),
data_type: DataType::Array(None),
},
expr_from_projection(only(&select.projection))
);
}

#[test]
fn parse_json_using_colon() {
let sql = "SELECT a:b FROM t";
Expand Down