mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-11-14 21:28:40 +03:00
2397836f8e
The result of a SQL statement execution is either:
1. An error.
2. The list of rows inserted, deleted, selected, etc.
(2) is currently represented by a combination of the Result class and
the ResultSet list it holds. This worked okay, but issues start to
arise when trying to use Result in non-statement contexts (for example,
when introducing Result to SQL expression execution).
What we really need is for Result to be a thin wrapper that represents
both (1) and (2), and to not have any explicit members like a ResultSet.
So this commit removes ResultSet from Result, and introduces ResultOr,
which is just an alias for AK::ErrorOrr. Statement execution now returns
ResultOr<ResultSet> instead of Result. This further opens the door for
expression execution to return ResultOr<Value> in the future.
Lastly, this moves some other context held by Result over to ResultSet.
This includes the row count (which is really just the size of ResultSet)
and the command for which the result is for.
48 lines
1.1 KiB
C++
48 lines
1.1 KiB
C++
/*
|
|
* Copyright (c) 2022, Jan de Visser <jan@de-visser.net>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include <AK/StringBuilder.h>
|
|
#include <LibSQL/Result.h>
|
|
|
|
namespace SQL {
|
|
|
|
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();
|
|
}
|
|
|
|
}
|