mirror of
https://github.com/SerenityOS/serenity.git
synced 2025-01-24 02:12:09 -05:00
5e1499d104
This commit un-deprecates DeprecatedString, and repurposes it as a byte string. As the null state has already been removed, there are no other particularly hairy blockers in repurposing this type as a byte string (what it _really_ is). This commit is auto-generated: $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \ Meta Ports Ladybird Tests Kernel) $ perl -pie 's/\bDeprecatedString\b/ByteString/g; s/deprecated_string/byte_string/g' $xs $ clang-format --style=file -i \ $(git diff --name-only | grep \.cpp\|\.h) $ gn format $(git ls-files '*.gn' '*.gni')
47 lines
1.1 KiB
C++
47 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 {
|
|
|
|
ByteString 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.to_byte_string();
|
|
}
|
|
|
|
}
|