Improved libpqxx conversions

Author: ankane

CMakeLists.txt

@@ -32,7 +32,7 @@ if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
         add_executable(test test/halfvec_test.cpp test/main.cpp test/pqxx_test.cpp test/sparsevec_test.cpp test/vector_test.cpp)
         target_link_libraries(test PRIVATE libpqxx::pqxx pgvector::pgvector)
         if(NOT MSVC)
-            target_compile_options(test PRIVATE -Wall -Wextra -Wpedantic -Werror -Wno-unused-parameter)
+            target_compile_options(test PRIVATE -Wall -Wextra -Wpedantic -Werror)
         endif()
     endif()
 endif()

include/pgvector/pqxx.hpp

@@ -32,14 +32,14 @@ template <> struct string_traits<pgvector::Vector> {
         }
 
         std::vector<float> result;
-        // TODO support empty array
-        // TODO don't copy string
-        std::istringstream ss(std::string(text.substr(1, text.size() - 2)));
-        while (ss.good()) {
-            std::string substr;
-            std::getline(ss, substr, ',');
-            // TODO use pqxx::from_string<float>
-            result.push_back(std::stof(substr));
+        if (text.size() > 2) {
+            // TODO don't copy string
+            std::istringstream ss(std::string(text.substr(1, text.size() - 2)));
+            while (ss.good()) {
+                std::string substr;
+                std::getline(ss, substr, ',');
+                result.push_back(string_traits<float>::from_string(substr, c));
+            }
         }
         return pgvector::Vector(result);
     }
@@ -69,14 +69,14 @@ template <> struct string_traits<pgvector::HalfVector> {
         }
 
         std::vector<float> result;
-        // TODO support empty array
-        // TODO don't copy string
-        std::istringstream ss(std::string(text.substr(1, text.size() - 2)));
-        while (ss.good()) {
-            std::string substr;
-            std::getline(ss, substr, ',');
-            // TODO use pqxx::from_string<float>
-            result.push_back(std::stof(substr));
+        if (text.size() > 2) {
+            // TODO don't copy string
+            std::istringstream ss(std::string(text.substr(1, text.size() - 2)));
+            while (ss.good()) {
+                std::string substr;
+                std::getline(ss, substr, ',');
+                result.push_back(string_traits<float>::from_string(substr, c));
+            }
         }
         return pgvector::HalfVector(result);
     }

test/pqxx_test.cpp

@@ -141,6 +141,7 @@ void test_vector_to_string() {
 
 void test_vector_from_string() {
     assert(pqxx::from_string<pgvector::Vector>("[1,2,3]") == pgvector::Vector({1, 2, 3}));
+    assert(pqxx::from_string<pgvector::Vector>("[]") == pgvector::Vector(std::vector<float>{}));
 
     try {
         auto unused = pqxx::from_string<pgvector::Vector>("");
@@ -156,27 +157,17 @@ void test_vector_from_string() {
         assert(std::string_view(e.what()) == "Malformed vector literal");
     }
 
-    // TODO change to no error?
-    try {
-        auto unused = pqxx::from_string<pgvector::Vector>("[]");
-        assert(false);
-    } catch (const std::invalid_argument& e) {
-        assert(true);
-    }
-
-    // TODO change to pqxx::conversion_error
     try {
         auto unused = pqxx::from_string<pgvector::Vector>("[hello]");
         assert(false);
-    } catch (const std::invalid_argument& e) {
+    } catch (const pqxx::conversion_error& e) {
         assert(true);
     }
 
-    // TODO change to pqxx::conversion_error
     try {
         auto unused = pqxx::from_string<pgvector::Vector>("[4e38]");
         assert(false);
-    } catch (const std::out_of_range& e) {
+    } catch (const pqxx::conversion_error& e) {
         assert(true);
     }
 }
@@ -187,6 +178,7 @@ void test_halfvec_to_string() {
 
 void test_halfvec_from_string() {
     assert(pqxx::from_string<pgvector::HalfVector>("[1,2,3]") == pgvector::HalfVector({1, 2, 3}));
+    assert(pqxx::from_string<pgvector::HalfVector>("[]") == pgvector::HalfVector(std::vector<float>{}));
 
     try {
         auto unused = pqxx::from_string<pgvector::HalfVector>("");
@@ -202,19 +194,10 @@ void test_halfvec_from_string() {
         assert(std::string_view(e.what()) == "Malformed halfvec literal");
     }
 
-    // TODO change to no error?
-    try {
-        auto unused = pqxx::from_string<pgvector::HalfVector>("[]");
-        assert(false);
-    } catch (const std::invalid_argument& e) {
-        assert(true);
-    }
-
-    // TODO change to pqxx::conversion_error
     try {
         auto unused = pqxx::from_string<pgvector::HalfVector>("[hello]");
         assert(false);
-    } catch (const std::invalid_argument& e) {
+    } catch (const pqxx::conversion_error& e) {
         assert(true);
     }
 }