Improve test, fix clang-tidy

taocpp · Nov 21, 2024 · f671262 · f671262
1 parent 21d8c96
commit f671262
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/include/tao/pq/transaction.hpp b/include/tao/pq/transaction.hpp
@@ -143,7 +143,7 @@ namespace tao::pq
 
       void set_single_row_mode();
 #if defined( LIBPQ_HAS_CHUNK_MODE )
-      void set_chunk_mode( const std::size_t rows );
+      void set_chunk_mode( const int rows );
 #endif
 
       [[nodiscard]] auto get_result( const std::chrono::steady_clock::time_point start = std::chrono::steady_clock::now() ) -> result;

diff --git a/src/lib/pq/transaction.cpp b/src/lib/pq/transaction.cpp
@@ -150,7 +150,7 @@ namespace tao::pq
    }
 
 #if defined( LIBPQ_HAS_CHUNK_MODE )
-   void transaction::set_chunk_mode( const std::size_t rows )
+   void transaction::set_chunk_mode( const int rows )
    {
       check_current_transaction();
       if( PQsetChunkedRowsMode( m_connection->underlying_raw_ptr(), rows ) == 0 ) {

diff --git a/src/test/pq/chunk_mode.cpp b/src/test/pq/chunk_mode.cpp
@@ -11,6 +11,15 @@
 
 #include <tao/pq.hpp>
 
+#if !defined( LIBPQ_HAS_CHUNK_MODE )
+
+auto main() -> int
+{
+   return 0;
+}
+
+#else
+
 namespace
 {
    void run()
@@ -32,6 +41,8 @@ namespace
       conn->execute( "insert_user", "Bob", 19 );
       conn->execute( "insert_user", "Charlie", 45 );
 
+      std::size_t count = 0;
+
       const auto tr = conn->transaction();
       tr->send( "SELECT name, age FROM tao_single_row_mode" );
       tr->set_chunk_mode( 2 );
@@ -43,18 +54,41 @@ namespace
          }
 
          for( const auto& row : result ) {
+            ++count;
+            std::cout << row[ "name" ].as< std::string >() << " is "
+                      << row[ "age" ].as< unsigned >() << " years old.\n";
+         }
+      }
+
+      TEST_ASSERT( count == 6 );
+
+      count = 0;
+      tr->send( "SELECT name, age FROM tao_single_row_mode" );
+      tr->set_chunk_mode( 4 );
+
+      while( true ) {
+         const auto result = tr->get_result();
+         if( result.empty() ) {
+            break;
+         }
+
+         for( const auto& row : result ) {
+            ++count;
             std::cout << row[ "name" ].as< std::string >() << " is "
                       << row[ "age" ].as< unsigned >() << " years old.\n";
          }
       }
 
+      TEST_ASSERT( count == 6 );
+
       TEST_THROWS( tr->set_single_row_mode() );
       TEST_THROWS( tr->set_chunk_mode( 2 ) );
 
       tr->send( "SELECT name, age FROM tao_single_row_mode" );
       TEST_THROWS( tr->set_chunk_mode( 0 ) );
       TEST_THROWS( tr->set_chunk_mode( -1 ) );
       tr->set_chunk_mode( 2 );
+      TEST_THROWS( tr->set_single_row_mode() );
    }
 
 }  // namespace
@@ -75,3 +109,5 @@ auto main() -> int  // NOLINT(bugprone-exception-escape)
    }
    // LCOV_EXCL_STOP
 }
+
+#endif