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

fix clippy

Browse source
This commit is contained in:
b41sh 2021-08-18 13:17:07 +08:00
parent 80759a4deb
commit 2c296f9dc4
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ast/mod.rs
View file

@ -993,16 +993,16 @@ impl fmt::Display for Statement {
} }
match hive_distribution { match hive_distribution {
HiveDistributionStyle::PARTITIONED { columns } => { HiveDistributionStyle::PARTITIONED { columns } => {
write!(f, " PARTITIONED BY ({})", display_comma_separated(&columns))?; write!(f, " PARTITIONED BY ({})", display_comma_separated(columns))?;
} }
HiveDistributionStyle::CLUSTERED { HiveDistributionStyle::CLUSTERED {
columns, columns,
sorted_by, sorted_by,
num_buckets, num_buckets,
} => { } => {
write!(f, " CLUSTERED BY ({})", display_comma_separated(&columns))?; write!(f, " CLUSTERED BY ({})", display_comma_separated(columns))?;
if !sorted_by.is_empty() { if !sorted_by.is_empty() {
write!(f, " SORTED BY ({})", display_comma_separated(&sorted_by))?; write!(f, " SORTED BY ({})", display_comma_separated(sorted_by))?;
} }
if *num_buckets > 0 { if *num_buckets > 0 {
write!(f, " INTO {} BUCKETS", num_buckets)?; write!(f, " INTO {} BUCKETS", num_buckets)?;
@ -1016,8 +1016,8 @@ impl fmt::Display for Statement {
write!( write!(
f, f,
" SKEWED BY ({})) ON ({})", " SKEWED BY ({})) ON ({})",
display_comma_separated(&columns), display_comma_separated(columns),
display_comma_separated(&on) display_comma_separated(on)
)?; )?;
if *stored_as_directories { if *stored_as_directories {
write!(f, " STORED AS DIRECTORIES")?; write!(f, " STORED AS DIRECTORIES")?;

2
src/parser.rs
View file

@ -102,7 +102,7 @@ impl<'a> Parser<'a> {
/// Parse a SQL statement and produce an Abstract Syntax Tree (AST) /// Parse a SQL statement and produce an Abstract Syntax Tree (AST)
pub fn parse_sql(dialect: &dyn Dialect, sql: &str) -> Result<Vec<Statement>, ParserError> { pub fn parse_sql(dialect: &dyn Dialect, sql: &str) -> Result<Vec<Statement>, ParserError> {
let mut tokenizer = Tokenizer::new(dialect, &sql); let mut tokenizer = Tokenizer::new(dialect, sql);
let tokens = tokenizer.tokenize()?; let tokens = tokenizer.tokenize()?;
let mut parser = Parser::new(tokens, dialect); let mut parser = Parser::new(tokens, dialect);
let mut stmts = Vec::new(); let mut stmts = Vec::new();

6
src/test_utils.rs
View file

@ -64,7 +64,7 @@ impl TestedDialects {
} }
pub fn parse_sql_statements(&self, sql: &str) -> Result<Vec<Statement>, ParserError> { pub fn parse_sql_statements(&self, sql: &str) -> Result<Vec<Statement>, ParserError> {
self.one_of_identical_results(|dialect| Parser::parse_sql(dialect, &sql)) self.one_of_identical_results(|dialect| Parser::parse_sql(dialect, sql))
// To fail the `ensure_multiple_dialects_are_tested` test: // To fail the `ensure_multiple_dialects_are_tested` test:
// Parser::parse_sql(&**self.dialects.first().unwrap(), sql) // Parser::parse_sql(&**self.dialects.first().unwrap(), sql)
} }
@ -75,11 +75,11 @@ impl TestedDialects {
/// tree as parsing `canonical`, and that serializing it back to string /// tree as parsing `canonical`, and that serializing it back to string
/// results in the `canonical` representation. /// results in the `canonical` representation.
pub fn one_statement_parses_to(&self, sql: &str, canonical: &str) -> Statement { pub fn one_statement_parses_to(&self, sql: &str, canonical: &str) -> Statement {
let mut statements = self.parse_sql_statements(&sql).unwrap(); let mut statements = self.parse_sql_statements(sql).unwrap();
assert_eq!(statements.len(), 1); assert_eq!(statements.len(), 1);
if !canonical.is_empty() && sql != canonical { if !canonical.is_empty() && sql != canonical {
assert_eq!(self.parse_sql_statements(&canonical).unwrap(), statements); assert_eq!(self.parse_sql_statements(canonical).unwrap(), statements);
} }
let only_statement = statements.pop().unwrap(); let only_statement = statements.pop().unwrap();