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

implement IN operator

This commit is contained in:
Pedro 2017-03-07 15:44:44 +01:00
parent 052f20ed1d
commit b4adfa5b74
3 changed files with 56 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/parser/bison_parser.y
View File

@ -197,7 +197,7 @@ int yyerror(YYLTYPE* llocp, SQLParserResult** result, yyscan_t scanner, const ch
%type <expr> expr operand scalar_expr unary_expr binary_expr logic_expr exists_expr
%type <expr> function_expr between_expr star_expr expr_alias placeholder_expr
%type <expr> column_name literal int_literal num_literal string_literal
%type <expr> comp_expr opt_where join_condition opt_having case_expr
%type <expr> comp_expr opt_where join_condition opt_having case_expr in_expr
%type <limit> opt_limit opt_top
%type <order> order_desc
%type <order_type> opt_order_type
@ -621,6 +621,7 @@ expr:
| logic_expr
| exists_expr
| case_expr
| in_expr
;
operand:
@ -645,12 +646,12 @@ unary_expr:
binary_expr:
comp_expr
| operand '-' operand { $$ = Expr::makeOpBinary($1, '-', $3); }
| operand '+' operand { $$ = Expr::makeOpBinary($1, '+', $3); }
| operand '/' operand { $$ = Expr::makeOpBinary($1, '/', $3); }
| operand '*' operand { $$ = Expr::makeOpBinary($1, '*', $3); }
| operand '%' operand { $$ = Expr::makeOpBinary($1, '%', $3); }
| operand '^' operand { $$ = Expr::makeOpBinary($1, '^', $3); }
| operand '-' operand { $$ = Expr::makeOpBinary($1, '-', $3); }
| operand '+' operand { $$ = Expr::makeOpBinary($1, '+', $3); }
| operand '/' operand { $$ = Expr::makeOpBinary($1, '/', $3); }
| operand '*' operand { $$ = Expr::makeOpBinary($1, '*', $3); }
| operand '%' operand { $$ = Expr::makeOpBinary($1, '%', $3); }
| operand '^' operand { $$ = Expr::makeOpBinary($1, '^', $3); }
| operand LIKE operand { $$ = Expr::makeOpBinary($1, Expr::LIKE, $3); }
| operand NOT LIKE operand { $$ = Expr::makeOpBinary($1, Expr::NOT_LIKE, $4); }
;
@ -660,9 +661,17 @@ logic_expr:
| expr OR expr { $$ = Expr::makeOpBinary($1, Expr::OR, $3); }
;
// TODO:
in_expr:
operand IN '(' expr_list ')' { $$ = Expr::makeInOperator($1, $4, false); }
| operand NOT IN '(' expr_list ')' { $$ = Expr::makeInOperator($1, $5, true); }
| operand IN '(' select_no_paren ')' { $$ = Expr::makeInOperator($1, $4, false); }
| operand NOT IN '(' select_no_paren ')' { $$ = Expr::makeInOperator($1, $5, true); }
;
// TODO: allow no else specified
case_expr:
CASE WHEN operand THEN operand ELSE operand END { $$ = Expr::makeCase($3, $5, $7); }
CASE WHEN expr THEN operand ELSE operand END { $$ = Expr::makeCase($3, $5, $7); }
;
exists_expr:
@ -715,7 +724,6 @@ star_expr:
'*' { $$ = new Expr(kExprStar); }
;
placeholder_expr:
'?' {
$$ = Expr::makePlaceholder(yylloc.total_column);

34
src/sql/Expr.cpp
View File

@ -137,6 +137,40 @@ namespace hsql {
return e;
}
Expr* Expr::makeInOperator(Expr* expr, std::vector<Expr*>* exprList, bool notIn) {
Expr* e = new Expr(kExprOperator);
e->opType = IN;
e->expr = expr;
e->exprList = exprList;
// If it is NOT IN, wrap the IN in a NOT operator.
if (notIn) {
Expr* neg = new Expr(kExprOperator);
neg->opType = NOT;
neg->expr = e;
return neg;
}
return e;
}
Expr* Expr::makeInOperator(Expr* expr, SelectStatement* select, bool notIn) {
Expr* e = new Expr(kExprOperator);
e->opType = IN;
e->expr = expr;
e->select = select;
// If it is NOT IN, wrap the IN in a NOT operator.
if (notIn) {
Expr* neg = new Expr(kExprOperator);
neg->opType = NOT;
neg->expr = e;
return neg;
}
return e;
}
bool Expr::isType(ExprType e_type) {
return e_type == type;
}

5
src/sql/Expr.h
View File

@ -49,6 +49,7 @@ namespace hsql {
NOT_LIKE,
AND,
OR,
IN,
// Unary operators.
NOT,
@ -131,6 +132,10 @@ namespace hsql {
static Expr* makeSelect(SelectStatement* select);
static Expr* makeExists(SelectStatement* select);
static Expr* makeInOperator(Expr* expr, std::vector<Expr*>* exprList, bool notIn);
static Expr* makeInOperator(Expr* expr, SelectStatement* select, bool notIn);
};
// Zero initializes an Expr object and assigns it to a space in the heap