Core/Database: Add new member functions to Field class that return empty optionals if database result was NULL

src/server/database/Database/Field.cpp

@@ -26,137 +26,219 @@ Field::Field() : _value(nullptr), _length(0), _meta(nullptr)
 
 Field::~Field() = default;
 
-uint8 Field::GetUInt8() const
+uint8 Field::GetUInt8() const noexcept
 {
-    if (!_value)
-        return 0;
-
-    return _meta->Converter->GetUInt8(_value, _length, _meta);
+    if (_value)
+        return _meta->Converter->GetUInt8(_value, _length, _meta);
+    return 0;
 }
 
-int8 Field::GetInt8() const
+int8 Field::GetInt8() const noexcept
 {
-    if (!_value)
-        return 0;
-
-    return _meta->Converter->GetInt8(_value, _length, _meta);
+    if (_value)
+        return _meta->Converter->GetInt8(_value, _length, _meta);
+    return 0;
 }
 
-uint16 Field::GetUInt16() const
+uint16 Field::GetUInt16() const noexcept
 {
-    if (!_value)
-        return 0;
-
-    return _meta->Converter->GetUInt16(_value, _length, _meta);
+    if (_value)
+        return _meta->Converter->GetUInt16(_value, _length, _meta);
+    return 0;
 }
 
-int16 Field::GetInt16() const
+int16 Field::GetInt16() const noexcept
 {
-    if (!_value)
-        return 0;
-
-    return _meta->Converter->GetInt16(_value, _length, _meta);
+    if (_value)
+        return _meta->Converter->GetInt16(_value, _length, _meta);
+    return 0;
 }
 
-uint32 Field::GetUInt32() const
+uint32 Field::GetUInt32() const noexcept
 {
-    if (!_value)
-        return 0;
-
-    return _meta->Converter->GetUInt32(_value, _length, _meta);
+    if (_value)
+        return _meta->Converter->GetUInt32(_value, _length, _meta);
+    return 0;
 }
 
-int32 Field::GetInt32() const
+int32 Field::GetInt32() const noexcept
 {
-    if (!_value)
-        return 0;
-
-    return _meta->Converter->GetInt32(_value, _length, _meta);
+    if (_value)
+        return _meta->Converter->GetInt32(_value, _length, _meta);
+    return 0;
 }
 
-uint64 Field::GetUInt64() const
+uint64 Field::GetUInt64() const noexcept
 {
-    if (!_value)
-        return 0;
-
-    return _meta->Converter->GetUInt64(_value, _length, _meta);
+    if (_value)
+        return _meta->Converter->GetUInt64(_value, _length, _meta);
+    return 0;
 }
 
-int64 Field::GetInt64() const
+int64 Field::GetInt64() const noexcept
 {
-    if (!_value)
-        return 0;
-
-    return _meta->Converter->GetInt64(_value, _length, _meta);
+    if (_value)
+        return _meta->Converter->GetInt64(_value, _length, _meta);
+    return 0;
 }
 
-float Field::GetFloat() const
+float Field::GetFloat() const noexcept
 {
-    if (!_value)
-        return 0.0f;
-
-    return _meta->Converter->GetFloat(_value, _length, _meta);
+    if (_value)
+        return _meta->Converter->GetFloat(_value, _length, _meta);
+    return 0.0f;
 }
 
-double Field::GetDouble() const
+double Field::GetDouble() const noexcept
 {
-    if (!_value)
-        return 0.0;
-
-    return _meta->Converter->GetDouble(_value, _length, _meta);
+    if (_value)
+        return _meta->Converter->GetDouble(_value, _length, _meta);
+    return 0.0;
 }
 
-SystemTimePoint Field::GetDate() const
+SystemTimePoint Field::GetDate() const noexcept
 {
-    if (!_value)
-        return SystemTimePoint::min();
-
-    return _meta->Converter->GetDate(_value, _length, _meta);
+    if (_value)
+        return _meta->Converter->GetDate(_value, _length, _meta);
+    return SystemTimePoint::min();
 }
 
-char const* Field::GetCString() const
+char const* Field::GetCString() const noexcept
 {
-    if (!_value)
-        return nullptr;
-
-    return _meta->Converter->GetCString(_value, _length, _meta);
+    if (_value)
+        return _meta->Converter->GetCString(_value, _length, _meta);
+    return nullptr;
 }
 
-std::string Field::GetString() const
+std::string Field::GetString() const noexcept
+{
+    return std::string(GetStringView());
+}
+
+std::string_view Field::GetStringView() const noexcept
 {
-    std::string result;
     if (char const* string = GetCString())
-        result.assign(string, _length);
-
-    return result;
+        return { string, _length };
+    return {};
 }
 
-std::string_view Field::GetStringView() const
+std::vector<uint8> Field::GetBinary() const noexcept
 {
-    std::string_view result;
-    if (char const* const string = GetCString())
-        result = { string, _length };
-
-    return result;
+    std::span<uint8 const> binary = GetBinaryView();
+    return { binary.begin(), binary.end() };
 }
 
-std::vector<uint8> Field::GetBinary() const
-{
-    std::vector<uint8> result;
-    if (!_value || !_length)
-        return result;
-
-    result.resize(_length);
-    memcpy(result.data(), _value, _length);
-    return result;
-}
-
-std::span<uint8 const> Field::GetBinaryView() const
+std::span<uint8 const> Field::GetBinaryView() const noexcept
 {
     return { reinterpret_cast<uint8 const*>(_value), _length };
 }
 
-void Field::GetBinarySizeChecked(uint8* buf, size_t length) const
+Optional<uint8> Field::GetUInt8OrNull() const noexcept
+{
+    if (_value)
+        return _meta->Converter->GetUInt8(_value, _length, _meta);
+    return {};
+}
+
+Optional<int8> Field::GetInt8OrNull() const noexcept
+{
+    if (_value)
+        return _meta->Converter->GetInt8(_value, _length, _meta);
+    return {};
+}
+
+Optional<uint16> Field::GetUInt16OrNull() const noexcept
+{
+    if (_value)
+        return _meta->Converter->GetUInt16(_value, _length, _meta);
+    return {};
+}
+
+Optional<int16> Field::GetInt16OrNull() const noexcept
+{
+    if (_value)
+        return _meta->Converter->GetInt16(_value, _length, _meta);
+    return {};
+}
+
+Optional<uint32> Field::GetUInt32OrNull() const noexcept
+{
+    if (_value)
+        return _meta->Converter->GetUInt32(_value, _length, _meta);
+    return {};
+}
+
+Optional<int32> Field::GetInt32OrNull() const noexcept
+{
+    if (_value)
+        return _meta->Converter->GetInt32(_value, _length, _meta);
+    return {};
+}
+
+Optional<uint64> Field::GetUInt64OrNull() const noexcept
+{
+    if (_value)
+        return _meta->Converter->GetUInt64(_value, _length, _meta);
+    return {};
+}
+
+Optional<int64> Field::GetInt64OrNull() const noexcept
+{
+    if (_value)
+        return _meta->Converter->GetInt64(_value, _length, _meta);
+    return {};
+}
+
+Optional<float> Field::GetFloatOrNull() const noexcept
+{
+    if (_value)
+        return _meta->Converter->GetFloat(_value, _length, _meta);
+    return {};
+}
+
+Optional<double> Field::GetDoubleOrNull() const noexcept
+{
+    if (_value)
+        return _meta->Converter->GetDouble(_value, _length, _meta);
+    return {};
+}
+
+Optional<SystemTimePoint> Field::GetDateOrNull() const noexcept
+{
+    if (_value)
+        return _meta->Converter->GetDate(_value, _length, _meta);
+    return {};
+}
+
+Optional<std::string> Field::GetStringOrNull() const noexcept
+{
+    if (Optional<std::string_view> string = GetStringViewOrNull())
+        return Optional<std::string>(std::in_place, *string);
+    return {};
+}
+
+Optional<std::string_view> Field::GetStringViewOrNull() const noexcept
+{
+    if (char const* string = GetCString())
+        return Optional<std::string_view>(std::in_place, string, _length);
+    return {};
+}
+
+Optional<std::vector<uint8>> Field::GetBinaryOrNull() const noexcept
+{
+    if (Optional<std::span<uint8 const>> binary = GetBinaryViewOrNull())
+        return Optional<std::vector<uint8>>(std::in_place, binary->begin(), binary->end());
+    return {};
+}
+
+Optional<std::span<uint8 const>> Field::GetBinaryViewOrNull() const noexcept
+{
+    if (_value)
+        return Optional<std::span<uint8 const>>(std::in_place, reinterpret_cast<uint8 const*>(_value), _length);
+    return {};
+}
+
+void Field::GetBinarySizeChecked(uint8* buf, size_t length) const noexcept
 {
     ASSERT(_value && (_length == length), "Expected %zu-byte binary blob, got %sdata (%u bytes) instead", length, _value ? "" : "no ", _length);
     memcpy(buf, _value, length);