Updated examples and tests for libpqxx 7.10.0

ankane · ankane · commit eaa9e9f3dfc8 · 2024-12-24T06:30:16.000-08:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
           make
           sudo make install
       - run: |
-          git clone --branch 7.9.2 https://github.com/jtv/libpqxx.git
+          git clone --branch 7.10.0 https://github.com/jtv/libpqxx.git
           cd libpqxx
           CXXFLAGS=-std=c++17 ./configure
           make
diff --git a/README.md b/README.md
@@ -33,32 +33,32 @@ Include the header
 Enable the extension
 
 ```cpp
-tx.exec0("CREATE EXTENSION IF NOT EXISTS vector");
+tx.exec("CREATE EXTENSION IF NOT EXISTS vector");
 ```
 
 Create a table
 
 ```cpp
-tx.exec0("CREATE TABLE items (id bigserial PRIMARY KEY, embedding vector(3))");
+tx.exec("CREATE TABLE items (id bigserial PRIMARY KEY, embedding vector(3))");
 ```
 
 Insert a vector
 
 ```cpp
 auto embedding = pgvector::Vector({1, 2, 3});
-tx.exec_params("INSERT INTO items (embedding) VALUES ($1)", embedding);
+tx.exec("INSERT INTO items (embedding) VALUES ($1)", {embedding});
 ```
 
 Get the nearest neighbors
 
 ```cpp
-pqxx::result R{tx.exec_params("SELECT * FROM items ORDER BY embedding <-> $1 LIMIT 5", embedding)};
+pqxx::result r = tx.exec("SELECT * FROM items ORDER BY embedding <-> $1 LIMIT 5", {embedding});
 ```
 
 Retrieve a vector
 
 ```cpp
-auto row = tx.exec1("SELECT embedding FROM items LIMIT 1");
+auto row = tx.exec("SELECT embedding FROM items LIMIT 1").one_row();
 auto embedding = row[0].as<pgvector::Vector>();
 ```
 
@@ -91,6 +91,6 @@ To get started with development:
 git clone https://github.com/pgvector/pgvector-cpp.git
 cd pgvector-cpp
 createdb pgvector_cpp_test
-g++ -std=c++17 -Wall -Wextra -Werror -o test/pqxx test/pqxx_test.cpp -lpqxx -lpq
+g++ -std=c++17 -Wall -Wextra -Wno-unknown-attributes -Werror -o test/pqxx test/pqxx_test.cpp -lpqxx -lpq
 test/pqxx
 ```
diff --git a/test/pqxx_test.cpp b/test/pqxx_test.cpp
@@ -4,32 +4,32 @@
 #include <pqxx/pqxx>
 
 void setup(pqxx::connection &conn) {
-  pqxx::work tx{conn};
-  tx.exec0("CREATE EXTENSION IF NOT EXISTS vector");
-  tx.exec0("DROP TABLE IF EXISTS items");
-  tx.exec0("CREATE TABLE items (id serial PRIMARY KEY, embedding vector(3), half_embedding halfvec(3), binary_embedding bit(3), sparse_embedding sparsevec(3))");
+  pqxx::work tx(conn);
+  tx.exec("CREATE EXTENSION IF NOT EXISTS vector");
+  tx.exec("DROP TABLE IF EXISTS items");
+  tx.exec("CREATE TABLE items (id serial PRIMARY KEY, embedding vector(3), half_embedding halfvec(3), binary_embedding bit(3), sparse_embedding sparsevec(3))");
   tx.commit();
 }
 
 void before_each(pqxx::connection &conn) {
-  pqxx::work tx{conn};
-  tx.exec0("TRUNCATE items");
+  pqxx::work tx(conn);
+  tx.exec("TRUNCATE items");
   tx.commit();
 }
 
 void test_vector(pqxx::connection &conn) {
   before_each(conn);
 
-  pqxx::work tx{conn};
+  pqxx::work tx(conn);
   auto embedding = pgvector::Vector({1, 2, 3});
   assert(embedding.dimensions() == 3);
   float arr[] = {4, 5, 6};
   auto embedding2 = pgvector::Vector(arr, 3);
-  tx.exec_params("INSERT INTO items (embedding) VALUES ($1), ($2), ($3)",
-                  embedding, embedding2, std::nullopt);
+  tx.exec("INSERT INTO items (embedding) VALUES ($1), ($2), ($3)",
+                  {embedding, embedding2, std::nullopt});
 
-  pqxx::result res{tx.exec_params(
-      "SELECT embedding FROM items ORDER BY embedding <-> $1", embedding2)};
+  pqxx::result res = tx.exec(
+      "SELECT embedding FROM items ORDER BY embedding <-> $1", {embedding2});
   assert(res.size() == 3);
   assert(res[0][0].as<pgvector::Vector>() == embedding2);
   assert(res[1][0].as<pgvector::Vector>() == embedding);
@@ -40,16 +40,16 @@ void test_vector(pqxx::connection &conn) {
 void test_halfvec(pqxx::connection &conn) {
   before_each(conn);
 
-  pqxx::work tx{conn};
+  pqxx::work tx(conn);
   auto embedding = pgvector::HalfVector({1, 2, 3});
   assert(embedding.dimensions() == 3);
   float arr[] = {4, 5, 6};
   auto embedding2 = pgvector::HalfVector(arr, 3);
-  tx.exec_params("INSERT INTO items (half_embedding) VALUES ($1), ($2), ($3)",
-                  embedding, embedding2, std::nullopt);
+  tx.exec("INSERT INTO items (half_embedding) VALUES ($1), ($2), ($3)",
+                  {embedding, embedding2, std::nullopt});
 
-  pqxx::result res{tx.exec_params(
-      "SELECT half_embedding FROM items ORDER BY half_embedding <-> $1", embedding2)};
+  pqxx::result res = tx.exec(
+      "SELECT half_embedding FROM items ORDER BY half_embedding <-> $1", {embedding2});
   assert(res.size() == 3);
   assert(res[0][0].as<pgvector::HalfVector>() == embedding2);
   assert(res[1][0].as<pgvector::HalfVector>() == embedding);
@@ -60,14 +60,14 @@ void test_halfvec(pqxx::connection &conn) {
 void test_bit(pqxx::connection &conn) {
   before_each(conn);
 
-  pqxx::work tx{conn};
+  pqxx::work tx(conn);
   auto embedding = "101";
   auto embedding2 = "111";
-  tx.exec_params("INSERT INTO items (binary_embedding) VALUES ($1), ($2), ($3)",
-                  embedding, embedding2, std::nullopt);
+  tx.exec("INSERT INTO items (binary_embedding) VALUES ($1), ($2), ($3)",
+                  {embedding, embedding2, std::nullopt});
 
-  pqxx::result res{tx.exec_params(
-      "SELECT binary_embedding FROM items ORDER BY binary_embedding <~> $1", embedding2)};
+  pqxx::result res = tx.exec(
+      "SELECT binary_embedding FROM items ORDER BY binary_embedding <~> $1", pqxx::params{embedding2});
   assert(res.size() == 3);
   assert(res[0][0].as<std::string>() == embedding2);
   assert(res[1][0].as<std::string>() == embedding);
@@ -77,14 +77,14 @@ void test_bit(pqxx::connection &conn) {
 void test_sparsevec(pqxx::connection &conn) {
   before_each(conn);
 
-  pqxx::work tx{conn};
+  pqxx::work tx(conn);
   auto embedding = pgvector::SparseVector({1, 2, 3});
   auto embedding2 = pgvector::SparseVector({4, 5, 6});
-  tx.exec_params("INSERT INTO items (sparse_embedding) VALUES ($1), ($2), ($3)",
-                  embedding, embedding2, std::nullopt);
+  tx.exec("INSERT INTO items (sparse_embedding) VALUES ($1), ($2), ($3)",
+                  {embedding, embedding2, std::nullopt});
 
-  pqxx::result res{tx.exec_params(
-      "SELECT sparse_embedding FROM items ORDER BY sparse_embedding <-> $1", embedding2)};
+  pqxx::result res = tx.exec(
+      "SELECT sparse_embedding FROM items ORDER BY sparse_embedding <-> $1", {embedding2});
   assert(res.size() == 3);
   assert(res[0][0].as<std::string>() == "{1:4,2:5,3:6}/3");
   assert(res[1][0].as<std::string>() == "{1:1,2:2,3:3}/3");
@@ -95,11 +95,11 @@ void test_sparsevec(pqxx::connection &conn) {
 void test_sparsevec_nnz(pqxx::connection &conn) {
   before_each(conn);
 
-  pqxx::work tx{conn};
+  pqxx::work tx(conn);
   std::vector<float> vec(16001, 1);
   auto embedding = pgvector::SparseVector(vec);
   try {
-    tx.exec_params("INSERT INTO items (sparse_embedding) VALUES ($1)", embedding);
+    tx.exec("INSERT INTO items (sparse_embedding) VALUES ($1)", {embedding});
     assert(false);
   } catch (const pqxx::conversion_overrun& e) {
     assert(std::strcmp(e.what(), "sparsevec cannot have more than 16000 dimensions") == 0);
@@ -110,9 +110,9 @@ void test_sparsevec_nnz(pqxx::connection &conn) {
 void test_stream(pqxx::connection &conn) {
   before_each(conn);
 
-  pqxx::work tx{conn};
+  pqxx::work tx(conn);
   auto embedding = pgvector::Vector({1, 2, 3});
-  tx.exec_params("INSERT INTO items (embedding) VALUES ($1)", embedding);
+  tx.exec("INSERT INTO items (embedding) VALUES ($1)", {embedding});
   int count = 0;
   for (auto [id, embedding] : tx.stream<int, pgvector::Vector>("SELECT id, embedding FROM items WHERE embedding IS NOT NULL")) {
     assert(embedding.dimensions() == 3);
@@ -125,11 +125,11 @@ void test_stream(pqxx::connection &conn) {
 void test_precision(pqxx::connection &conn) {
   before_each(conn);
 
-  pqxx::work tx{conn};
+  pqxx::work tx(conn);
   auto embedding = pgvector::Vector({1.23456789, 0, 0});
-  tx.exec_params("INSERT INTO items (embedding) VALUES ($1)", embedding);
-  tx.exec0("SET extra_float_digits = 3");
-  pqxx::result res{tx.exec_params("SELECT embedding FROM items ORDER BY id DESC LIMIT 1")};
+  tx.exec("INSERT INTO items (embedding) VALUES ($1)", {embedding});
+  tx.exec("SET extra_float_digits = 3");
+  pqxx::result res = tx.exec("SELECT embedding FROM items ORDER BY id DESC LIMIT 1");
   assert(res[0][0].as<pgvector::Vector>() == embedding);
   tx.commit();
 }
