RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 04:48:14 +00:00
Code Issues Activity Actions

LibSQL: Allow expressions and column names in SELECT ... FROM

Browse source 
Up to now the only ``SELECT`` statement that worked was ``SELECT *
FROM <table>``. This commit allows a column list consisting of
column names and expressions in addition to ``*``. ``WHERE``
still doesn't work though.
This commit is contained in:
Jan de Visser 2021-09-16 22:29:19 +02:00 • committed by Andreas Kling
parent f33a288ca4
commit fe50598a03
8 changed files with 90 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Userland/Libraries/LibSQL/AST/Select.cpp
View file

@ -14,22 +14,36 @@ namespace SQL::AST {
RefPtr<SQLResult> Select::execute(ExecutionContext& context) const
{
if (table_or_subquery_list().size() == 1 && table_or_subquery_list()[0].is_table()) {
if (result_column_list().size() == 1 && result_column_list()[0].type() == ResultType::All) {
auto table = context.database->get_table(table_or_subquery_list()[0].schema_name(), table_or_subquery_list()[0].table_name());
if (!table) {
return SQLResult::construct(SQL::SQLCommand::Select, SQL::SQLErrorCode::TableDoesNotExist, table_or_subquery_list()[0].table_name());
}
NonnullRefPtr<TupleDescriptor> descriptor = table->to_tuple_descriptor();
context.result = SQLResult::construct();
for (auto& row : context.database->select_all(*table)) {
Tuple tuple(descriptor);
for (auto ix = 0u; ix < descriptor->size(); ix++) {
tuple[ix] = row[ix];
}
context.result->append(tuple);
}
return context.result;
auto table = context.database->get_table(table_or_subquery_list()[0].schema_name(), table_or_subquery_list()[0].table_name());
if (!table) {
return SQLResult::construct(SQL::SQLCommand::Select, SQL::SQLErrorCode::TableDoesNotExist, table_or_subquery_list()[0].table_name());
}
NonnullRefPtrVector<ResultColumn> columns;
if (result_column_list().size() == 1 && result_column_list()[0].type() == ResultType::All) {
for (auto& col : table->columns()) {
columns.append(
create_ast_node<ResultColumn>(
create_ast_node<ColumnNameExpression>(table->parent()->name(), table->name(), col.name()),
""));
}
} else {
for (auto& col : result_column_list()) {
columns.append(col);
}
}
context.result = SQLResult::construct();
AK::NonnullRefPtr<TupleDescriptor> descriptor = AK::adopt_ref(*new TupleDescriptor);
for (auto& row : context.database->select_all(*table)) {
context.current_row = &row;
Tuple tuple(descriptor);
for (auto& col : columns) {
auto value = col.expression()->evaluate(context);
tuple.append(value);
}
context.result->append(tuple);
}
return context.result;
}
return SQLResult::construct();
}