DBIS
/
HyriseSQLParser
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added join definition to grammar. put limit and order tokens into lexer

This commit is contained in:
Pedro 2014-11-03 23:26:33 +01:00
parent ae44960bad
commit ff0167cde6
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/parser/bison_parser.y
View File

@ -72,7 +72,9 @@ typedef void* yyscan_t;
uint uval; uint uval;
hsql::Statement* statement; hsql::Statement* statement;
hsql::SelectStatement* select_statement; hsql::SelectStatement* select_stmt;
hsql::JoinStatement* join_stmt;
hsql::TableRef* table; hsql::TableRef* table;
hsql::Expr* expr; hsql::Expr* expr;
hsql::OrderDescription* order; hsql::OrderDescription* order;
@ -102,7 +104,8 @@ typedef void* yyscan_t;
** Non-Terminal types (http://www.gnu.org/software/bison/manual/html_node/Type-Decl.html) ** Non-Terminal types (http://www.gnu.org/software/bison/manual/html_node/Type-Decl.html)
*********************************/ *********************************/
%type <statement> statement %type <statement> statement
%type <select_statement> select_statement %type <select_stmt> select_statement
%type <join_stmt> join_statement
%type <sval> table_name %type <sval> table_name
%type <table> from_clause table_ref table_ref_atomic %type <table> from_clause table_ref table_ref_atomic
%type <expr> expr scalar_expr unary_expr binary_expr function_expr star_expr %type <expr> expr scalar_expr unary_expr binary_expr function_expr star_expr
@ -153,7 +156,25 @@ input:
// Atm: only select statements (future: insert, delete, etc...) // Atm: only select statements (future: insert, delete, etc...)
statement: statement:
select_statement { $$ = $1; } select_statement { $$ = $1; }
| /* empty */ { $$ = NULL; } | join_statement { $$ = $1; }
;
/******************************
** Join Statements
******************************/
join_statement:
select_statement JOIN table_ref ON join_condition
{
$$ = new JoinStatement();
}
;
join_condition:
expr
; ;
@ -161,9 +182,6 @@ statement:
** Select Statements ** Select Statements
******************************/ ******************************/
// TODO: join
// TODO: limit
// TODO: order by
select_statement: select_statement:
SELECT select_list from_clause where_clause group_clause order_by_clause limit_clause SELECT select_list from_clause where_clause group_clause order_by_clause limit_clause
{ {
@ -176,6 +194,7 @@ select_statement:
s->limit = $7; s->limit = $7;
$$ = s; $$ = s;
} }
| '(' select_statement ')' { $$ = $2; }
; ;

7
src/parser/flex_lexer.l
View File

@ -58,6 +58,13 @@ NOT TOKEN(NOT)
AND TOKEN(AND) AND TOKEN(AND)
OR TOKEN(OR) OR TOKEN(OR)
LIMIT TOKEN(LIMIT)
ORDER TOKEN(ORDER)
ASC TOKEN(ASC)
DESC TOKEN(DESC)
JOIN TOKEN(JOIN)
ON TOKEN(ON)
"=" TOKEN(EQUALS) "=" TOKEN(EQUALS)
"<>" TOKEN(NOTEQUALS) "<>" TOKEN(NOTEQUALS)
"<" TOKEN(LESS) "<" TOKEN(LESS)