Updated libpqxx for tests and examples

ankane · ankane · commit 8132687a088d · 2025-10-02T11:06:17.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,7 +26,7 @@ if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
     if(BUILD_TESTING)
         include(FetchContent)
 
-        FetchContent_Declare(libpqxx GIT_REPOSITORY https://github.com/jtv/libpqxx.git GIT_TAG 7.10.1)
+        FetchContent_Declare(libpqxx GIT_REPOSITORY https://github.com/jtv/libpqxx.git GIT_TAG 7.10.2)
         FetchContent_MakeAvailable(libpqxx)
 
         add_executable(test test/halfvec_test.cpp test/main.cpp test/pqxx_test.cpp test/sparsevec_test.cpp test/vector_test.cpp)
diff --git a/examples/citus/CMakeLists.txt b/examples/citus/CMakeLists.txt
@@ -6,7 +6,7 @@ set(CMAKE_CXX_STANDARD 17)
 
 include(FetchContent)
 
-FetchContent_Declare(libpqxx GIT_REPOSITORY https://github.com/jtv/libpqxx.git GIT_TAG 7.10.1)
+FetchContent_Declare(libpqxx GIT_REPOSITORY https://github.com/jtv/libpqxx.git GIT_TAG 7.10.2)
 FetchContent_MakeAvailable(libpqxx)
 
 add_subdirectory("${PROJECT_SOURCE_DIR}/../.." pgvector)
diff --git a/examples/cohere/CMakeLists.txt b/examples/cohere/CMakeLists.txt
@@ -8,7 +8,7 @@ include(FetchContent)
 
 FetchContent_Declare(cpr GIT_REPOSITORY https://github.com/libcpr/cpr.git GIT_TAG 1.11.1)
 FetchContent_Declare(json GIT_REPOSITORY https://github.com/nlohmann/json.git GIT_TAG v3.11.3)
-FetchContent_Declare(libpqxx GIT_REPOSITORY https://github.com/jtv/libpqxx.git GIT_TAG 7.10.1)
+FetchContent_Declare(libpqxx GIT_REPOSITORY https://github.com/jtv/libpqxx.git GIT_TAG 7.10.2)
 FetchContent_MakeAvailable(cpr json libpqxx)
 
 add_subdirectory("${PROJECT_SOURCE_DIR}/../.." pgvector)
diff --git a/examples/disco/CMakeLists.txt b/examples/disco/CMakeLists.txt
@@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD 20)
 include(FetchContent)
 
 FetchContent_Declare(disco GIT_REPOSITORY https://github.com/ankane/disco-cpp.git GIT_TAG v0.1.3)
-FetchContent_Declare(libpqxx GIT_REPOSITORY https://github.com/jtv/libpqxx.git GIT_TAG 7.10.1)
+FetchContent_Declare(libpqxx GIT_REPOSITORY https://github.com/jtv/libpqxx.git GIT_TAG 7.10.2)
 FetchContent_MakeAvailable(disco libpqxx)
 
 add_subdirectory("${PROJECT_SOURCE_DIR}/../.." pgvector)
diff --git a/examples/hybrid/CMakeLists.txt b/examples/hybrid/CMakeLists.txt
@@ -8,7 +8,7 @@ include(FetchContent)
 
 FetchContent_Declare(cpr GIT_REPOSITORY https://github.com/libcpr/cpr.git GIT_TAG 1.11.1)
 FetchContent_Declare(json GIT_REPOSITORY https://github.com/nlohmann/json.git GIT_TAG v3.11.3)
-FetchContent_Declare(libpqxx GIT_REPOSITORY https://github.com/jtv/libpqxx.git GIT_TAG 7.10.1)
+FetchContent_Declare(libpqxx GIT_REPOSITORY https://github.com/jtv/libpqxx.git GIT_TAG 7.10.2)
 FetchContent_MakeAvailable(cpr json libpqxx)
 
 add_subdirectory("${PROJECT_SOURCE_DIR}/../.." pgvector)
diff --git a/examples/loading/CMakeLists.txt b/examples/loading/CMakeLists.txt
@@ -6,7 +6,7 @@ set(CMAKE_CXX_STANDARD 17)
 
 include(FetchContent)
 
-FetchContent_Declare(libpqxx GIT_REPOSITORY https://github.com/jtv/libpqxx.git GIT_TAG 7.10.1)
+FetchContent_Declare(libpqxx GIT_REPOSITORY https://github.com/jtv/libpqxx.git GIT_TAG 7.10.2)
 FetchContent_MakeAvailable(libpqxx)
 
 add_subdirectory("${PROJECT_SOURCE_DIR}/../.." pgvector)
diff --git a/examples/openai/CMakeLists.txt b/examples/openai/CMakeLists.txt
@@ -8,7 +8,7 @@ include(FetchContent)
 
 FetchContent_Declare(cpr GIT_REPOSITORY https://github.com/libcpr/cpr.git GIT_TAG 1.11.1)
 FetchContent_Declare(json GIT_REPOSITORY https://github.com/nlohmann/json.git GIT_TAG v3.11.3)
-FetchContent_Declare(libpqxx GIT_REPOSITORY https://github.com/jtv/libpqxx.git GIT_TAG 7.10.1)
+FetchContent_Declare(libpqxx GIT_REPOSITORY https://github.com/jtv/libpqxx.git GIT_TAG 7.10.2)
 FetchContent_MakeAvailable(cpr json libpqxx)
 
 add_subdirectory("${PROJECT_SOURCE_DIR}/../.." pgvector)
diff --git a/examples/rdkit/CMakeLists.txt b/examples/rdkit/CMakeLists.txt
@@ -9,7 +9,7 @@ find_package(Boost COMPONENTS iostreams serialization system REQUIRED)
 
 include(FetchContent)
 
-FetchContent_Declare(libpqxx GIT_REPOSITORY https://github.com/jtv/libpqxx.git GIT_TAG 7.10.1)
+FetchContent_Declare(libpqxx GIT_REPOSITORY https://github.com/jtv/libpqxx.git GIT_TAG 7.10.2)
 FetchContent_MakeAvailable(libpqxx)
 
 add_subdirectory("${PROJECT_SOURCE_DIR}/../.." pgvector)
diff --git a/examples/sparse/CMakeLists.txt b/examples/sparse/CMakeLists.txt
@@ -8,7 +8,7 @@ include(FetchContent)
 
 FetchContent_Declare(cpr GIT_REPOSITORY https://github.com/libcpr/cpr.git GIT_TAG 1.11.1)
 FetchContent_Declare(json GIT_REPOSITORY https://github.com/nlohmann/json.git GIT_TAG v3.11.3)
-FetchContent_Declare(libpqxx GIT_REPOSITORY https://github.com/jtv/libpqxx.git GIT_TAG 7.10.1)
+FetchContent_Declare(libpqxx GIT_REPOSITORY https://github.com/jtv/libpqxx.git GIT_TAG 7.10.2)
 FetchContent_MakeAvailable(cpr json libpqxx)
 
 add_subdirectory("${PROJECT_SOURCE_DIR}/../.." pgvector)
diff --git a/test/pqxx_test.cpp b/test/pqxx_test.cpp
@@ -245,7 +245,7 @@ void test_sparsevec_from_string() {
         auto unused = pqxx::from_string<pgvector::SparseVector>("{ }/");
         assert(false);
     } catch (const pqxx::conversion_error& e) {
-        assert(std::string_view(e.what()) == "Could not convert '' to int");
+        assert(std::string_view(e.what()) == "Could not convert '' to int: Invalid argument.");
     }
 
     try {
@@ -259,7 +259,7 @@ void test_sparsevec_from_string() {
         auto unused = pqxx::from_string<pgvector::SparseVector>("{:}/1");
         assert(false);
     } catch (const pqxx::conversion_error& e) {
-        assert(std::string_view(e.what()) == "Could not convert '' to int");
+        assert(std::string_view(e.what()) == "Could not convert '' to int: Invalid argument.");
     }
 
     try {
@@ -294,7 +294,7 @@ void test_sparsevec_from_string() {
         auto unused = pqxx::from_string<pgvector::SparseVector>("{a:1}/1");
         assert(false);
     } catch (const pqxx::conversion_error& e) {
-        assert(std::string_view(e.what()) == "Could not convert 'a' to int");
+        assert(std::string_view(e.what()) == "Could not convert 'a' to int: Invalid argument.");
     }
 
     try {
@@ -308,7 +308,7 @@ void test_sparsevec_from_string() {
         auto unused = pqxx::from_string<pgvector::SparseVector>("{}/a");
         assert(false);
     } catch (const pqxx::conversion_error& e) {
-        assert(std::string_view(e.what()) == "Could not convert 'a' to int");
+        assert(std::string_view(e.what()) == "Could not convert 'a' to int: Invalid argument.");
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ void test_sparsevec_from_string() {`
`245`	`245`	`auto unused = pqxx::from_string<pgvector::SparseVector>("{ }/");`
`246`	`246`	`assert(false);`
`247`	`247`	`} catch (const pqxx::conversion_error& e) {`
`248`		`- assert(std::string_view(e.what()) == "Could not convert '' to int");`
	`248`	`+ assert(std::string_view(e.what()) == "Could not convert '' to int: Invalid argument.");`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`try {`
`@@ -259,7 +259,7 @@ void test_sparsevec_from_string() {`
`259`	`259`	`auto unused = pqxx::from_string<pgvector::SparseVector>("{:}/1");`
`260`	`260`	`assert(false);`
`261`	`261`	`} catch (const pqxx::conversion_error& e) {`
`262`		`- assert(std::string_view(e.what()) == "Could not convert '' to int");`
	`262`	`+ assert(std::string_view(e.what()) == "Could not convert '' to int: Invalid argument.");`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`try {`
`@@ -294,7 +294,7 @@ void test_sparsevec_from_string() {`
`294`	`294`	`auto unused = pqxx::from_string<pgvector::SparseVector>("{a:1}/1");`
`295`	`295`	`assert(false);`
`296`	`296`	`} catch (const pqxx::conversion_error& e) {`
`297`		`- assert(std::string_view(e.what()) == "Could not convert 'a' to int");`
	`297`	`+ assert(std::string_view(e.what()) == "Could not convert 'a' to int: Invalid argument.");`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`try {`
`@@ -308,7 +308,7 @@ void test_sparsevec_from_string() {`
`308`	`308`	`auto unused = pqxx::from_string<pgvector::SparseVector>("{}/a");`
`309`	`309`	`assert(false);`
`310`	`310`	`} catch (const pqxx::conversion_error& e) {`
`311`		`- assert(std::string_view(e.what()) == "Could not convert 'a' to int");`
	`311`	`+ assert(std::string_view(e.what()) == "Could not convert 'a' to int: Invalid argument.");`
`312`	`312`	`}`
`313`	`313`	`}`
`314`	`314`