diff options
author | Jan de Visser <jan@de-visser.net> | 2021-11-02 16:49:54 -0400 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-11-10 14:47:49 +0100 |
commit | 3425730294e9913627e36b2ddc559f337e0f186b (patch) | |
tree | c0d8228bb4f8a6e73be863e19c91f844b7a95356 /Userland/Libraries | |
parent | 87f4c1677bd45366e2e6ebff0dd6c5e84f254482 (diff) | |
download | serenity-3425730294e9913627e36b2ddc559f337e0f186b.zip |
LibSQL: Implement table joins
This patch introduces table joins. It uses a pretty dumb algorithm-
starting with a singleton '__unity__' row consisting of a single boolean
value, a cartesian product of all tables in the 'FROM' clause is built.
This cartesian product is then filtered through the 'WHERE' clause,
again without any smarts just using brute force.
This patch required a bunch of busy work to allow for example the
ColumnNameExpression having to deal with multiple tables potentially
having columns with the same name.
Diffstat (limited to 'Userland/Libraries')
-rw-r--r-- | Userland/Libraries/LibSQL/AST/Expression.cpp | 14 | ||||
-rw-r--r-- | Userland/Libraries/LibSQL/AST/Select.cpp | 90 | ||||
-rw-r--r-- | Userland/Libraries/LibSQL/SQLResult.h | 1 |
3 files changed, 73 insertions, 32 deletions
diff --git a/Userland/Libraries/LibSQL/AST/Expression.cpp b/Userland/Libraries/LibSQL/AST/Expression.cpp index d3e1337be2..a7b793e602 100644 --- a/Userland/Libraries/LibSQL/AST/Expression.cpp +++ b/Userland/Libraries/LibSQL/AST/Expression.cpp @@ -170,11 +170,21 @@ Value ColumnNameExpression::evaluate(ExecutionContext& context) const { auto& descriptor = *context.current_row->descriptor(); VERIFY(context.current_row->size() == descriptor.size()); + Optional<size_t> index_in_row; for (auto ix = 0u; ix < context.current_row->size(); ix++) { auto& column_descriptor = descriptor[ix]; - if (column_descriptor.name == column_name()) - return { (*context.current_row)[ix] }; + if (!table_name().is_empty() && column_descriptor.table != table_name()) + continue; + if (column_descriptor.name == column_name()) { + if (index_in_row.has_value()) { + context.result->set_error(SQLErrorCode::AmbiguousColumnName, column_name()); + return Value::null(); + } + index_in_row = ix; + } } + if (index_in_row.has_value()) + return (*context.current_row)[index_in_row.value()]; context.result->set_error(SQLErrorCode::ColumnDoesNotExist, column_name()); return Value::null(); } diff --git a/Userland/Libraries/LibSQL/AST/Select.cpp b/Userland/Libraries/LibSQL/AST/Select.cpp index 6214e67015..81ef322a57 100644 --- a/Userland/Libraries/LibSQL/AST/Select.cpp +++ b/Userland/Libraries/LibSQL/AST/Select.cpp @@ -13,13 +13,14 @@ namespace SQL::AST { RefPtr<SQLResult> Select::execute(ExecutionContext& context) const { - if (table_or_subquery_list().size() == 1 && table_or_subquery_list()[0].is_table()) { - auto table = context.database->get_table(table_or_subquery_list()[0].schema_name(), table_or_subquery_list()[0].table_name()); + NonnullRefPtrVector<ResultColumn> columns; + for (auto& table_descriptor : table_or_subquery_list()) { + if (!table_descriptor.is_table()) + TODO(); + auto table = context.database->get_table(table_descriptor.schema_name(), table_descriptor.table_name()); if (!table) { - return SQLResult::construct(SQL::SQLCommand::Select, SQL::SQLErrorCode::TableDoesNotExist, table_or_subquery_list()[0].table_name()); + return SQLResult::construct(SQL::SQLCommand::Select, SQL::SQLErrorCode::TableDoesNotExist, table_descriptor.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( @@ -27,35 +28,64 @@ RefPtr<SQLResult> Select::execute(ExecutionContext& context) const 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); - Tuple tuple(descriptor); - for (auto& row : context.database->select_all(*table)) { - context.current_row = &row; - if (where_clause()) { - auto where_result = where_clause()->evaluate(context); - if (context.result->has_error()) - return context.result; - if (!where_result) - continue; - } - tuple.clear(); - for (auto& col : columns) { - auto value = col.expression()->evaluate(context); - if (context.result->has_error()) - return context.result; - tuple.append(value); + } + + VERIFY(!result_column_list().is_empty()); + if (result_column_list().size() != 1 || result_column_list()[0].type() != ResultType::All) { + for (auto& col : result_column_list()) { + if (col.type() == ResultType::All) + // FIXME can have '*' for example in conjunction with computed columns + return SQLResult::construct(SQL::SQLCommand::Select, SQL::SQLErrorCode::SyntaxError, "*"); + columns.append(col); + } + } + + context.result = SQLResult::construct(); + AK::NonnullRefPtr<TupleDescriptor> descriptor = AK::adopt_ref(*new TupleDescriptor); + Tuple tuple(descriptor); + Vector<Tuple> rows; + descriptor->empend("__unity__"); + tuple.append(Value(SQLType::Boolean, true)); + rows.append(tuple); + + for (auto& table_descriptor : table_or_subquery_list()) { + if (!table_descriptor.is_table()) + TODO(); + auto table = context.database->get_table(table_descriptor.schema_name(), table_descriptor.table_name()); + if (table->num_columns() == 0) + continue; + auto old_descriptor_size = descriptor->size(); + descriptor->extend(table->to_tuple_descriptor()); + for (auto cartesian_row = rows.first(); cartesian_row.size() == old_descriptor_size; cartesian_row = rows.first()) { + rows.remove(0); + for (auto& table_row : context.database->select_all(*table)) { + auto new_row = cartesian_row; + new_row.extend(table_row); + rows.append(new_row); } - context.result->append(tuple); } - return context.result; } - return SQLResult::construct(); + + for (auto& row : rows) { + context.current_row = &row; + if (where_clause()) { + auto where_result = where_clause()->evaluate(context); + if (context.result->has_error()) + return context.result; + if (!where_result) + continue; + } + tuple.clear(); + for (auto& col : columns) { + auto value = col.expression()->evaluate(context); + if (context.result->has_error()) + return context.result; + tuple.append(value); + } + context.result->append(tuple); + } + return context.result; } } diff --git a/Userland/Libraries/LibSQL/SQLResult.h b/Userland/Libraries/LibSQL/SQLResult.h index 33eab92c2a..6f14873655 100644 --- a/Userland/Libraries/LibSQL/SQLResult.h +++ b/Userland/Libraries/LibSQL/SQLResult.h @@ -51,6 +51,7 @@ constexpr char const* command_tag(SQLCommand command) S(SchemaExists, "Schema '{}' already exist") \ S(TableDoesNotExist, "Table '{}' does not exist") \ S(ColumnDoesNotExist, "Column '{}' does not exist") \ + S(AmbiguousColumnName, "Column name '{}' is ambiguous") \ S(TableExists, "Table '{}' already exist") \ S(InvalidType, "Invalid type '{}'") \ S(InvalidDatabaseName, "Invalid database name '{}'") \ |