mirror of
https://github.com/RGBCube/serenity
synced 2025-05-28 13:55:06 +00:00
LibSQL: Add a new Result class to replace SQLResult
The existing SQLResult class predates our TRY semantics. As a result, in the AST execution methods, there is a lot of is_error checking on values that could instead be wrapped with TRY. This new class will allow such semantics, and is also stack allocated (no need to be a RefPtr). It is heavily based on LibJS's completion class.
This commit is contained in:
parent
f2fae3a21c
commit
d9055de7ea
3 changed files with 136 additions and 0 deletions
|
@ -4,6 +4,7 @@
|
|||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <AK/StringBuilder.h>
|
||||
#include <LibSQL/SQLResult.h>
|
||||
|
||||
namespace SQL {
|
||||
|
@ -28,4 +29,63 @@ void SQLResult::limit(size_t offset, size_t limit)
|
|||
}
|
||||
}
|
||||
|
||||
void Result::insert(Tuple const& row, Tuple const& sort_key)
|
||||
{
|
||||
if (!m_result_set.has_value())
|
||||
m_result_set = ResultSet {};
|
||||
m_result_set->insert_row(row, sort_key);
|
||||
}
|
||||
|
||||
void Result::limit(size_t offset, size_t limit)
|
||||
{
|
||||
VERIFY(has_results());
|
||||
|
||||
if (offset > 0) {
|
||||
if (offset > m_result_set->size()) {
|
||||
m_result_set->clear();
|
||||
return;
|
||||
}
|
||||
|
||||
m_result_set->remove(0, offset);
|
||||
}
|
||||
|
||||
if (m_result_set->size() > limit)
|
||||
m_result_set->remove(limit, m_result_set->size() - limit);
|
||||
}
|
||||
|
||||
String Result::error_string() const
|
||||
{
|
||||
VERIFY(is_error());
|
||||
|
||||
StringView error_code;
|
||||
StringView error_description;
|
||||
|
||||
switch (m_error) {
|
||||
#undef __ENUMERATE_SQL_ERROR
|
||||
#define __ENUMERATE_SQL_ERROR(error, description) \
|
||||
case SQLErrorCode::error: \
|
||||
error_code = #error##sv; \
|
||||
error_description = description##sv; \
|
||||
break;
|
||||
ENUMERATE_SQL_ERRORS(__ENUMERATE_SQL_ERROR)
|
||||
#undef __ENUMERATE_SQL_ERROR
|
||||
default:
|
||||
VERIFY_NOT_REACHED();
|
||||
}
|
||||
|
||||
StringBuilder builder;
|
||||
builder.appendff("{}: ", error_code);
|
||||
|
||||
if (m_error_message.has_value()) {
|
||||
if (error_description.find("{}"sv).has_value())
|
||||
builder.appendff(error_description, *m_error_message);
|
||||
else
|
||||
builder.appendff("{}: {}", error_description, *m_error_message);
|
||||
} else {
|
||||
builder.append(error_description);
|
||||
}
|
||||
|
||||
return builder.build();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue