Change format for column names in exceptions

taocpp · Apr 27, 2024 · 93e3f74 · 93e3f74
1 parent 85ed652
commit 93e3f74
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/include/tao/pq/row.hpp b/include/tao/pq/row.hpp
@@ -244,7 +244,7 @@ namespace tao::pq
       {
          if( result_traits_size< T > != m_columns ) {
             const auto type = internal::demangle< T >();
-            throw std::out_of_range( internal::printf( "datatype (%.*s) requires %zu columns, but row/slice has %zu columns", static_cast< int >( type.size() ), type.data(), result_traits_size< T >, m_columns ) );
+            throw std::out_of_range( internal::printf( "datatype '%.*s' requires %zu columns, but row/slice has %zu columns", static_cast< int >( type.size() ), type.data(), result_traits_size< T >, m_columns ) );
          }
          return get< T >( 0 );
       }

diff --git a/include/tao/pq/table_row.hpp b/include/tao/pq/table_row.hpp
@@ -238,7 +238,7 @@ namespace tao::pq
       {
          if( result_traits_size< T > != m_columns ) {
             const auto type = internal::demangle< T >();
-            throw std::out_of_range( internal::printf( "datatype (%.*s) requires %zu columns, but table_row/slice has %zu columns", static_cast< int >( type.size() ), type.data(), result_traits_size< T >, m_columns ) );
+            throw std::out_of_range( internal::printf( "datatype '%.*s' requires %zu columns, but table_row/slice has %zu columns", static_cast< int >( type.size() ), type.data(), result_traits_size< T >, m_columns ) );
          }
          return get< T >( 0 );
       }

diff --git a/src/lib/pq/result.cpp b/src/lib/pq/result.cpp
@@ -83,7 +83,7 @@ namespace tao::pq
       if( column < 0 ) {
          assert( column == -1 );
          check_has_result_set();
-         throw std::out_of_range( "column not found: " + std::string( in_name ) );
+         throw std::out_of_range( "column '" + std::string( in_name ) + "' not found" );
       }
       return column;
    }
@@ -122,7 +122,7 @@ namespace tao::pq
    auto result::get( const std::size_t row, const std::size_t column ) const -> const char*
    {
       if( is_null( row, column ) ) {
-         throw std::runtime_error( internal::printf( "unexpected NULL value in row %zu column %zu = %s", row, column, name( column ).c_str() ) );
+         throw std::runtime_error( internal::printf( "unexpected NULL value in row %zu column %zu/'%s'", row, column, name( column ).c_str() ) );
       }
       return PQgetvalue( m_pgresult.get(), static_cast< int >( row ), static_cast< int >( column ) );
    }