vaclavt/usql
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

constant introduced

Browse Source
This commit is contained in:
VaclavT
2021-08-16 14:53:23 +02:00
parent 3a55007c5b
commit 273ab66da9
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
parser.cpp
View File

@@ -329,7 +329,7 @@ namespace usql {
m_lexer.skipToken(TokenType::keyword_by); m_lexer.skipToken(TokenType::keyword_by);
do { do {
int col_index = -1; int col_index = FUNCTION_CALL;
bool asc = true; bool asc = true;
auto token_type = m_lexer.tokenType(); auto token_type = m_lexer.tokenType();

2
parser.h
View File

@@ -8,6 +8,8 @@
#include <string> #include <string>
#include <vector> #include <vector>
static const int FUNCTION_CALL = -1;
namespace usql { namespace usql {
enum class ColumnType { enum class ColumnType {

2
usql.cpp
View File

@@ -199,7 +199,7 @@ std::unique_ptr<Table> USql::execute_select(SelectFromTableNode &node) {
for (auto idx = 0; idx < result->columns_count(); idx++) { for (auto idx = 0; idx < result->columns_count(); idx++) {
auto row_col_index = source_table_col_index[idx]; auto row_col_index = source_table_col_index[idx];
if (row_col_index == -1) { // TODO introduce constant here if (row_col_index == FUNCTION_CALL) {
auto evaluated_value = eval_value_node(table, *row, node.cols_names->operator[](idx).value.get()); auto evaluated_value = eval_value_node(table, *row, node.cols_names->operator[](idx).value.get());
ValueNode *col_value = evaluated_value.get(); ValueNode *col_value = evaluated_value.get();