mirrors/datafusion-sqlparse
1
0
Fork 0
mirror of https://github.com/apache/datafusion-sqlparser-rs.git synced 2025-08-03 13:58:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

636 Adjusting VARBINARY and BINARY with optional precision (#637)

Browse source
This commit is contained in:
AugustoFKL 2022-10-01 17:52:44 -03:00 • committed by GitHub
parent c2d68255d0
commit 300e28bd85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/ast/data_type.rs
View file

@ -35,10 +35,16 @@ pub enum DataType {
Uuid, Uuid,
/// Large character object e.g. CLOB(1000) /// Large character object e.g. CLOB(1000)
Clob(u64), Clob(u64),
/// Fixed-length binary type e.g. BINARY(10) /// Fixed-length binary type with optional length e.g. [standard], [MS SQL Server]
Binary(u64), ///
/// Variable-length binary type e.g. VARBINARY(10) /// [standard]: https://jakewheat.github.io/sql-overview/sql-2016-foundation-grammar.html#binary-string-type
Varbinary(u64), /// [MS SQL Server]: https://learn.microsoft.com/pt-br/sql/t-sql/data-types/binary-and-varbinary-transact-sql?view=sql-server-ver16
Binary(Option<u64>),
/// Variable-length binary with optional length type e.g. [standard], [MS SQL Server]
///
/// [standard]: https://jakewheat.github.io/sql-overview/sql-2016-foundation-grammar.html#binary-string-type
/// [MS SQL Server]: https://learn.microsoft.com/pt-br/sql/t-sql/data-types/binary-and-varbinary-transact-sql?view=sql-server-ver16
Varbinary(Option<u64>),
/// Large binary object e.g. BLOB(1000) /// Large binary object e.g. BLOB(1000)
Blob(u64), Blob(u64),
/// Decimal type with optional precision and scale e.g. DECIMAL(10,2) /// Decimal type with optional precision and scale e.g. DECIMAL(10,2)
@ -126,8 +132,10 @@ impl fmt::Display for DataType {
} }
DataType::Uuid => write!(f, "UUID"), DataType::Uuid => write!(f, "UUID"),
DataType::Clob(size) => write!(f, "CLOB({})", size), DataType::Clob(size) => write!(f, "CLOB({})", size),
DataType::Binary(size) => write!(f, "BINARY({})", size), DataType::Binary(size) => format_type_with_optional_length(f, "BINARY", size, false),
DataType::Varbinary(size) => write!(f, "VARBINARY({})", size), DataType::Varbinary(size) => {
format_type_with_optional_length(f, "VARBINARY", size, false)
}
DataType::Blob(size) => write!(f, "BLOB({})", size), DataType::Blob(size) => write!(f, "BLOB({})", size),
DataType::Decimal(precision, scale) => { DataType::Decimal(precision, scale) => {
if let Some(scale) = scale { if let Some(scale) = scale {

8
src/parser.rs
View file

@ -3404,8 +3404,8 @@ impl<'a> Parser<'a> {
} }
} }
Keyword::CLOB => Ok(DataType::Clob(self.parse_precision()?)), Keyword::CLOB => Ok(DataType::Clob(self.parse_precision()?)),
Keyword::BINARY => Ok(DataType::Binary(self.parse_precision()?)), Keyword::BINARY => Ok(DataType::Binary(self.parse_optional_precision()?)),
Keyword::VARBINARY => Ok(DataType::Varbinary(self.parse_precision()?)), Keyword::VARBINARY => Ok(DataType::Varbinary(self.parse_optional_precision()?)),
Keyword::BLOB => Ok(DataType::Blob(self.parse_precision()?)), Keyword::BLOB => Ok(DataType::Blob(self.parse_precision()?)),
Keyword::UUID => Ok(DataType::Uuid), Keyword::UUID => Ok(DataType::Uuid),
Keyword::DATE => Ok(DataType::Date), Keyword::DATE => Ok(DataType::Date),
@ -5260,6 +5260,10 @@ mod tests {
fn test_parse_data_type() { fn test_parse_data_type() {
test_parse_data_type("DOUBLE PRECISION", "DOUBLE PRECISION"); test_parse_data_type("DOUBLE PRECISION", "DOUBLE PRECISION");
test_parse_data_type("DOUBLE", "DOUBLE"); test_parse_data_type("DOUBLE", "DOUBLE");
test_parse_data_type("VARBINARY", "VARBINARY");
test_parse_data_type("VARBINARY(20)", "VARBINARY(20)");
test_parse_data_type("BINARY", "BINARY");
test_parse_data_type("BINARY(20)", "BINARY(20)");
fn test_parse_data_type(input: &str, expected: &str) { fn test_parse_data_type(input: &str, expected: &str) {
all_dialects().run_parser_method(input, |parser| { all_dialects().run_parser_method(input, |parser| {

4
tests/sqlparser_common.rs
View file

@ -1670,7 +1670,7 @@ fn parse_cast() {
assert_eq!( assert_eq!(
&Expr::Cast { &Expr::Cast {
expr: Box::new(Expr::Identifier(Ident::new("id"))), expr: Box::new(Expr::Identifier(Ident::new("id"))),
data_type: DataType::Binary(50) data_type: DataType::Binary(Some(50))
}, },
expr_from_projection(only(&select.projection)) expr_from_projection(only(&select.projection))
); );
@ -1680,7 +1680,7 @@ fn parse_cast() {
assert_eq!( assert_eq!(
&Expr::Cast { &Expr::Cast {
expr: Box::new(Expr::Identifier(Ident::new("id"))), expr: Box::new(Expr::Identifier(Ident::new("id"))),
data_type: DataType::Varbinary(50) data_type: DataType::Varbinary(Some(50))
}, },
expr_from_projection(only(&select.projection)) expr_from_projection(only(&select.projection))
); );