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

Print matching token for operator types instead of plain integer (#85) 

* Print matching token for operator types instead of plain integer

* Update sqlhelper.cpp
This commit is contained in:
f4lco 2019-08-13 16:07:19 +02:00 committed by mrks
parent 755ea052d7
commit 6e730a5436
1 changed files with 50 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/util/sqlhelper.cpp
View File

@ -1,6 +1,7 @@
#include "sqlhelper.h" #include "sqlhelper.h"
#include <iostream> #include <iostream>
#include <map>
#include <string> #include <string>
namespace hsql { namespace hsql {
@ -8,6 +9,8 @@ namespace hsql {
void printOperatorExpression(Expr* expr, uintmax_t numIndent); void printOperatorExpression(Expr* expr, uintmax_t numIndent);
void printAlias(Alias* alias, uintmax_t numIndent); void printAlias(Alias* alias, uintmax_t numIndent);
std::ostream& operator<<(std::ostream& os, const OperatorType& op);
std::string indent(uintmax_t numIndent) { std::string indent(uintmax_t numIndent) {
return std::string(numIndent, '\t'); return std::string(numIndent, '\t');
} }
@ -26,8 +29,8 @@ namespace hsql {
void inprintC(char val, uintmax_t numIndent) { void inprintC(char val, uintmax_t numIndent) {
std::cout << indent(numIndent).c_str() << val << std::endl; std::cout << indent(numIndent).c_str() << val << std::endl;
} }
void inprintU(uint64_t val, uintmax_t numIndent) { void inprint(const OperatorType& op, uintmax_t numIndent) {
std::cout << indent(numIndent).c_str() << val << std::endl; std::cout << indent(numIndent) << op << std::endl;
} }
void printTableRefInfo(TableRef* table, uintmax_t numIndent) { void printTableRefInfo(TableRef* table, uintmax_t numIndent) {
@ -78,27 +81,8 @@ namespace hsql {
return; return;
} }
switch (expr->opType) { inprint(expr->opType, numIndent);
case kOpAnd:
inprint("AND", numIndent);
break;
case kOpOr:
inprint("OR", numIndent);
break;
case kOpNot:
inprint("NOT", numIndent);
break;
case kOpExists:
inprint("EXISTS", numIndent);
break;
default:
inprintU(expr->opType, numIndent);
break;
}
if (expr->select) {
printSelectStatementInfo(expr->select, numIndent + 1);
} else {
printExpression(expr->expr, numIndent + 1); printExpression(expr->expr, numIndent + 1);
if (expr->expr2 != nullptr) { if (expr->expr2 != nullptr) {
printExpression(expr->expr2, numIndent + 1); printExpression(expr->expr2, numIndent + 1);
@ -106,7 +90,6 @@ namespace hsql {
for (Expr* e : *expr->exprList) printExpression(e, numIndent + 1); for (Expr* e : *expr->exprList) printExpression(e, numIndent + 1);
} }
} }
}
void printExpression(Expr* expr, uintmax_t numIndent) { void printExpression(Expr* expr, uintmax_t numIndent) {
if (!expr) return; if (!expr) return;
@ -263,4 +246,43 @@ namespace hsql {
} }
} }
std::ostream& operator<<(std::ostream& os, const OperatorType& op) {
static const std::map<const OperatorType, const std::string> operatorToToken = {
{kOpNone, "None"},
{kOpBetween, "BETWEEN"},
{kOpCase, "CASE"},
{kOpCaseListElement, "CASE LIST ELEMENT"},
{kOpPlus, "+"},
{kOpMinus, "-"},
{kOpAsterisk, "*"},
{kOpSlash, "/"},
{kOpPercentage, "%"},
{kOpCaret, "^"},
{kOpEquals, "="},
{kOpNotEquals, "!="},
{kOpLess, "<"},
{kOpLessEq, "<="},
{kOpGreater, ">"},
{kOpGreaterEq, ">="},
{kOpLike, "LIKE"},
{kOpNotLike, "NOT LIKE"},
{kOpILike, "ILIKE"},
{kOpAnd, "AND"},
{kOpOr, "OR"},
{kOpIn, "IN"},
{kOpConcat, "CONCAT"},
{kOpNot, "NOT"},
{kOpUnaryMinus, "-"},
{kOpIsNull, "IS NULL"},
{kOpExists, "EXISTS"}
};
const auto found = operatorToToken.find(op);
if (found == operatorToToken.cend()) {
return os << static_cast<uint64_t>(op);
} else {
return os << (*found).second;
}
}
} // namespace hsql } // namespace hsql