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

slightly better print, column alias supported

Browse Source
This commit is contained in:
VaclavT
2021-08-14 20:01:15 +02:00
parent 5201f32023
commit fb5098cf1d
9 changed files with 61 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
parser.cpp
View File

@@ -241,12 +241,18 @@ namespace usql {
auto column_value = parse_expression();
std::string column_alias;
if (column_value->node_type == NodeType::database_value) {
column_alias = ((DatabaseValueNode*) column_value.get())->col_name;
if (m_lexer.tokenType() == TokenType::keyword_as) {
m_lexer.skipToken(TokenType::keyword_as);
column_alias = m_lexer.consumeCurrentToken().token_string;
} else {
column_alias = "c" + std::to_string(i);
i++;
if (column_value->node_type == NodeType::database_value) {
column_alias = ((DatabaseValueNode*) column_value.get())->col_name;
} else {
column_alias = "c" + std::to_string(i);
i++;
}
}
cols->push_back(SelectColNode{std::move(column_value), column_alias});
}