Skip to content
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.

Sign up for GitHub

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

Use decl macro to simplify codes in parser_sql module #937

Merged
merged 1 commit into from
Oct 14, 2022
Merged

Use decl macro to simplify codes in parser_sql module #937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Use macros to generate SQL parsers
  • Loading branch information
@sa1
sa1 committed Oct 14, 2022
commit fa7aa6c8dbfe7bc3b307ad6b7083a6cb787c8b7e
9 changes: 4 additions & 5 deletions core/src/ast_builder/assignment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use super::ExprNode;
use crate::{
ast::{Assignment, Expr},
parse_sql::parse_sql_assignment,
parse_sql::parse_assignment,
result::{Error, Result},
translate::translate_assignment,
};
Expand All @@ -24,7 +24,7 @@ impl TryFrom<AssignmentNode> for Assignment {
fn try_from(node: AssignmentNode) -> Result<Self> {
match node {
AssignmentNode::Text(expr) => {
let expr = parse_sql_assignment(expr)
let expr = parse_assignment(expr)
.and_then(|assignment| translate_assignment(&assignment))?;
Ok(expr)
}
Expand All @@ -40,12 +40,11 @@ impl TryFrom<AssignmentNode> for Assignment {
#[cfg(test)]
mod tests {
use crate::{
ast_builder::AssignmentNode, parse_sql::parse_sql_assignment,
translate::translate_assignment,
ast_builder::AssignmentNode, parse_sql::parse_assignment, translate::translate_assignment,
};

fn test(actual: AssignmentNode, expected: &str) {
let parsed = &parse_sql_assignment(expected).expect(expected);
let parsed = &parse_assignment(expected).expect(expected);
let expected = translate_assignment(parsed);
assert_eq!(actual.try_into(), expected);
}
Expand Down
169 changes: 50 additions & 119 deletions core/src/parse_sql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,124 +18,55 @@ pub fn parse<Sql: AsRef<str>>(sql: Sql) -> Result<Vec<SqlStatement>> {
Parser::parse_sql(&DIALECT, sql.as_ref()).map_err(|e| Error::Parser(format!("{:#?}", e)))
}

pub fn parse_query<Sql: AsRef<str>>(sql_expr: Sql) -> Result<SqlQuery> {
let tokens = Tokenizer::new(&DIALECT, sql_expr.as_ref())
.tokenize()
.map_err(|e| Error::Parser(format!("{:#?}", e)))?;

Parser::new(tokens, &DIALECT)
.parse_query()
.map_err(|e| Error::Parser(format!("{:#?}", e)))
macro_rules! generate_parse_fn {
($fn_name: ident, $output_type: ty) => {
pub fn $fn_name<Sql: AsRef<str>>(sql_expr: Sql) -> Result<$output_type> {
let tokens = Tokenizer::new(&DIALECT, sql_expr.as_ref())
.tokenize()
.map_err(|e| Error::Parser(format!("{:#?}", e)))?;

Parser::new(tokens, &DIALECT)
.$fn_name()
.map_err(|e| Error::Parser(format!("{:#?}", e)))
}
};
($fn_name: ident, $parse_fn_name: ident, $parse_fn_arg: ident, $output_type: ty) => {
pub fn $fn_name<Sql: AsRef<str>>(sql_expr: Sql) -> Result<$output_type> {
let tokens = Tokenizer::new(&DIALECT, sql_expr.as_ref())
.tokenize()
.map_err(|e| Error::Parser(format!("{:#?}", e)))?;

Parser::new(tokens, &DIALECT)
.$parse_fn_name(Parser::$parse_fn_arg)
.map_err(|e| Error::Parser(format!("{:#?}", e)))
}
};
}

pub fn parse_expr<Sql: AsRef<str>>(sql_expr: Sql) -> Result<SqlExpr> {
let tokens = Tokenizer::new(&DIALECT, sql_expr.as_ref())
.tokenize()
.map_err(|e| Error::Parser(format!("{:#?}", e)))?;

Parser::new(tokens, &DIALECT)
.parse_expr()
.map_err(|e| Error::Parser(format!("{:#?}", e)))
}

pub fn parse_comma_separated_exprs<Sql: AsRef<str>>(sql_exprs: Sql) -> Result<Vec<SqlExpr>> {
let tokens = Tokenizer::new(&DIALECT, sql_exprs.as_ref())
.tokenize()
.map_err(|e| Error::Parser(format!("{:#?}", e)))?;

Parser::new(tokens, &DIALECT)
.parse_comma_separated(Parser::parse_expr)
.map_err(|e| Error::Parser(format!("{:#?}", e)))
}

pub fn parse_select_item<Sql: AsRef<str>>(sql_select_item: Sql) -> Result<SqlSelectItem> {
let tokens = Tokenizer::new(&DIALECT, sql_select_item.as_ref())
.tokenize()
.map_err(|e| Error::Parser(format!("{:#?}", e)))?;

Parser::new(tokens, &DIALECT)
.parse_select_item()
.map_err(|e| Error::Parser(format!("{:#?}", e)))
}

pub fn parse_select_items<Sql: AsRef<str>>(sql_select_items: Sql) -> Result<Vec<SqlSelectItem>> {
let tokens = Tokenizer::new(&DIALECT, sql_select_items.as_ref())
.tokenize()
.map_err(|e| Error::Parser(format!("{:#?}", e)))?;

Parser::new(tokens, &DIALECT)
.parse_comma_separated(Parser::parse_select_item)
.map_err(|e| Error::Parser(format!("{:#?}", e)))
}

pub fn parse_interval<Sql: AsRef<str>>(sql_interval: Sql) -> Result<SqlExpr> {
let tokens = Tokenizer::new(&DIALECT, sql_interval.as_ref())
.tokenize()
.map_err(|e| Error::Parser(format!("{:#?}", e)))?;

Parser::new(tokens, &DIALECT)
.parse_interval()
.map_err(|e| Error::Parser(format!("{:#?}", e)))
}

pub fn parse_order_by_expr<Sql: AsRef<str>>(sql_order_by_expr: Sql) -> Result<SqlOrderByExpr> {
let tokens = Tokenizer::new(&DIALECT, sql_order_by_expr.as_ref())
.tokenize()
.map_err(|e| Error::Parser(format!("{:#?}", e)))?;

Parser::new(tokens, &DIALECT)
.parse_order_by_expr()
.map_err(|e| Error::Parser(format!("{:#?}", e)))
}

pub fn parse_order_by_exprs<Sql: AsRef<str>>(
sql_orderby_exprs: Sql,
) -> Result<Vec<SqlOrderByExpr>> {
let tokens = Tokenizer::new(&DIALECT, sql_orderby_exprs.as_ref())
.tokenize()
.map_err(|e| Error::Parser(format!("{:#?}", e)))?;

Parser::new(tokens, &DIALECT)
.parse_comma_separated(Parser::parse_order_by_expr)
.map_err(|e| Error::Parser(format!("{:#?}", e)))
}

pub fn parse_column_def<Sql: AsRef<str>>(sql_column_def: Sql) -> Result<SqlColumnDef> {
let tokens = Tokenizer::new(&DIALECT, sql_column_def.as_ref())
.tokenize()
.map_err(|e| Error::Parser(format!("{:#?}", e)))?;

Parser::new(tokens, &DIALECT)
.parse_column_def()
.map_err(|e| Error::Parser(format!("{:#?}", e)))
}

pub fn parse_data_type<Sql: AsRef<str>>(sql_data_type: Sql) -> Result<SqlDataType> {
let tokens = Tokenizer::new(&DIALECT, sql_data_type.as_ref())
.tokenize()
.map_err(|e| Error::Parser(format!("{:#?}", e)))?;

Parser::new(tokens, &DIALECT)
.parse_data_type()
.map_err(|e| Error::Parser(format!("{:#?}", e)))
}

pub fn parse_sql_assignment<Sql: AsRef<str>>(sql_assignment: Sql) -> Result<SqlAssignment> {
let tokens = Tokenizer::new(&DIALECT, sql_assignment.as_ref())
.tokenize()
.map_err(|e| Error::Parser(format!("{:#?}", e)))?;

Parser::new(tokens, &DIALECT)
.parse_assignment()
.map_err(|e| Error::Parser(format!("{:#?}", e)))
}

pub fn parse_identifiers<Sql: AsRef<str>>(sql_identifiers: Sql) -> Result<Vec<SqlIdent>> {
let tokens = Tokenizer::new(&DIALECT, sql_identifiers.as_ref())
.tokenize()
.map_err(|e| Error::Parser(format!("{:#?}", e)))?;

Parser::new(tokens, &DIALECT)
.parse_identifiers()
.map_err(|e| Error::Parser(format!("{:#?}", e)))
}
generate_parse_fn!(parse_query, SqlQuery);
generate_parse_fn!(parse_expr, SqlExpr);
generate_parse_fn!(
parse_comma_separated_exprs,
parse_comma_separated,
parse_expr,
Vec<SqlExpr>
);
generate_parse_fn!(parse_select_item, SqlSelectItem);
generate_parse_fn!(
parse_select_items,
parse_comma_separated,
parse_select_item,
Vec<SqlSelectItem>
);
generate_parse_fn!(parse_interval, SqlExpr);
generate_parse_fn!(parse_order_by_expr, SqlOrderByExpr);
generate_parse_fn!(
parse_order_by_exprs,
parse_comma_separated,
parse_order_by_expr,
Vec<SqlOrderByExpr>
);
generate_parse_fn!(parse_column_def, SqlColumnDef);
generate_parse_fn!(parse_data_type, SqlDataType);
generate_parse_fn!(parse_assignment, SqlAssignment);
generate_parse_fn!(parse_identifiers, Vec<SqlIdent>);