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

Simplify custom datatypes handling and add a test

Browse source 
1) Simplified the bit in parse_datatype()
2) Made sure it was covered by the test (the "public.year" bit)
2a) ...the rest of changes in the test are to fix incorrect variable
 names: c_name/c_lat/c_lng were copy-pasted from a previous test.
3) Removed the branch from parse_pg_cast, which duplicated what
parse_data_type already handled (added in the same commit even
2007995938 )
This commit is contained in:
Nickolay Ponomarev 2019-01-11 01:22:10 +03:00
parent 7c6e6970fa
commit f21cd697c3
2 changed files with 25 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/sqlparser.rs
View file

@ -224,19 +224,13 @@ impl Parser {
}) })
} }
/// Parse a postgresql casting style which is in the form or expr::datatype /// Parse a postgresql casting style which is in the form of `expr::datatype`
pub fn parse_pg_cast(&mut self, expr: ASTNode) -> Result<ASTNode, ParserError> { pub fn parse_pg_cast(&mut self, expr: ASTNode) -> Result<ASTNode, ParserError> {
let _ = self.consume_token(&Token::DoubleColon)?; let _ = self.consume_token(&Token::DoubleColon)?;
let datatype = if let Ok(data_type) = self.parse_data_type() { let datatype = self.parse_data_type()?;
Ok(data_type)
} else if let Ok(table_name) = self.parse_tablename() {
Ok(SQLType::Custom(table_name))
} else {
parser_err!("Expecting datatype or identifier")
};
let pg_cast = ASTNode::SQLCast { let pg_cast = ASTNode::SQLCast {
expr: Box::new(expr), expr: Box::new(expr),
data_type: datatype?, data_type: datatype,
}; };
if let Some(Token::DoubleColon) = self.peek_token() { if let Some(Token::DoubleColon) = self.peek_token() {
self.parse_pg_cast(pg_cast) self.parse_pg_cast(pg_cast)
@ -945,13 +939,10 @@ impl Parser {
} }
_ => parser_err!(format!("Invalid data type '{:?}'", k)), _ => parser_err!(format!("Invalid data type '{:?}'", k)),
}, },
Some(Token::Identifier(id)) => { Some(Token::Identifier(_)) => {
if let Ok(true) = self.consume_token(&Token::Period) { self.prev_token();
let ids = self.parse_tablename()?; let type_name = self.parse_tablename()?; // TODO: this actually reads a possibly schema-qualified name of a (custom) type
Ok(SQLType::Custom(format!("{}.{}", id, ids))) Ok(SQLType::Custom(type_name))
} else {
Ok(SQLType::Custom(id))
}
} }
other => parser_err!(format!("Invalid data type: '{:?}'", other)), other => parser_err!(format!("Invalid data type: '{:?}'", other)),
} }

30
tests/sqlparser_postgres.rs
View file

@ -517,20 +517,26 @@ fn parse_create_table_from_pg_dump() {
ASTNode::SQLCreateTable { name, columns } => { ASTNode::SQLCreateTable { name, columns } => {
assert_eq!("public.customer", name); assert_eq!("public.customer", name);
let c_name = &columns[0]; let c_customer_id = &columns[0];
assert_eq!("customer_id", c_name.name); assert_eq!("customer_id", c_customer_id.name);
assert_eq!(SQLType::Int, c_name.data_type); assert_eq!(SQLType::Int, c_customer_id.data_type);
assert_eq!(false, c_name.allow_null); assert_eq!(false, c_customer_id.allow_null);
let c_lat = &columns[1]; let c_store_id = &columns[1];
assert_eq!("store_id", c_lat.name); assert_eq!("store_id", c_store_id.name);
assert_eq!(SQLType::SmallInt, c_lat.data_type); assert_eq!(SQLType::SmallInt, c_store_id.data_type);
assert_eq!(false, c_lat.allow_null); assert_eq!(false, c_store_id.allow_null);
let c_lng = &columns[2]; let c_first_name = &columns[2];
assert_eq!("first_name", c_lng.name); assert_eq!("first_name", c_first_name.name);
assert_eq!(SQLType::Varchar(Some(45)), c_lng.data_type); assert_eq!(SQLType::Varchar(Some(45)), c_first_name.data_type);
assert_eq!(false, c_lng.allow_null); assert_eq!(false, c_first_name.allow_null);
let c_release_year = &columns[10];
assert_eq!(
SQLType::Custom("public.year".to_string()),
c_release_year.data_type
);
} }
_ => assert!(false), _ => assert!(false),
} }