Unified interface for result::as<std::optional<T>>

taocpp · Nov 27, 2024 · f52d223 · f52d223
1 parent 68548af
commit f52d223
Showing 1 changed file with 25 additions and 5 deletions.
diff --git a/include/tao/pq/result.hpp b/include/tao/pq/result.hpp
@@ -34,6 +34,16 @@ namespace tao::pq
    class table_writer;
    class transaction;
 
+   namespace internal
+   {
+      template< typename >
+      inline constexpr bool is_optional = false;
+
+      template< typename T >
+      inline constexpr bool is_optional< std::optional< T > > = true;
+
+   }  // namespace internal
+
    class result final
    {
    private:
@@ -226,21 +236,31 @@ namespace tao::pq
       [[nodiscard]] auto at( const std::size_t row ) const -> pq::row;
 
       template< typename T >
+         requires internal::is_optional< T >
       [[nodiscard]] auto as() const -> T
       {
+         if( empty() ) {
+            return std::nullopt;
+         }
          if( size() != 1 ) {
-            throw std::runtime_error( std::format( "invalid result size: {} rows, expected 1 row", m_rows ) );
+            throw std::runtime_error( std::format( "invalid result size: {} rows, expected 0 or 1 rows", m_rows ) );
          }
          return ( *this )[ 0 ].as< T >();
       }
 
       template< typename T >
-      [[nodiscard]] auto optional() const -> std::optional< T >
+      [[nodiscard]] auto as() const -> T
       {
-         if( empty() ) {
-            return std::nullopt;
+         if( size() != 1 ) {
+            throw std::runtime_error( std::format( "invalid result size: {} rows, expected 1 row", m_rows ) );
          }
-         return as< T >();
+         return ( *this )[ 0 ].as< T >();
+      }
+
+      template< typename T >
+      [[nodiscard]] auto optional() const
+      {
+         return as< std::optional< T > >();
       }
 
       template< typename T, typename U >