feat postgresql: Allow passing ParameterStore to QueryQueue

Allow passing ParameterStore to QueryQueue commit_hash:a1891874f17ffc8e179ce3d2f02bef9d062e220a
userver-framework · Jan 27, 2025 · 7036a0a · 7036a0a
1 parent 598550b
commit 7036a0a
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git a/postgresql/include/userver/storages/postgres/query_queue.hpp b/postgresql/include/userver/storages/postgres/query_queue.hpp
@@ -18,6 +18,8 @@ USERVER_NAMESPACE_BEGIN
 
 namespace storages::postgres {
 
+class ParameterStore;
+
 /// @brief A container to enqueue queries in FIFO order and execute them all
 /// within a single network round-trip.
 ///
@@ -59,10 +61,12 @@ class QueryQueue final {
     /// timeout for later execution.
     template <typename... Args>
     void Push(CommandControl cc, const Query& query, const Args&... args);
+    void Push(CommandControl cc, const Query& query, const ParameterStore& store);
 
     /// Add a query into the queue with default command-control.
     template <typename... Args>
     void Push(const Query& query, const Args&... args);
+    void Push(const Query& query, const ParameterStore& store);
 
     /// Collect results of all the queued queries, with specified timeout.
     /// Either returns a vector of N `ResultSet`s, where N is the number of

diff --git a/postgresql/src/storages/postgres/query_queue.cpp b/postgresql/src/storages/postgres/query_queue.cpp
@@ -94,6 +94,12 @@ void QueryQueue::DoPush(CommandControl cc, const Query& query, ParamsHolder&& pa
 
 void QueryQueue::ValidateUsage() const { UINVARIANT(conn_, "The query queue is finalized and no longer usable."); }
 
+void QueryQueue::Push(CommandControl cc, const Query& query, const ParameterStore& store) {
+    DoPush(cc, query, ParamsHolder{{}, detail::QueryParameters(store.GetInternalData())});
+}
+
+void QueryQueue::Push(const Query& query, const ParameterStore& store) { Push(default_cc_, query, store); }
+
 }  // namespace storages::postgres
 
 USERVER_NAMESPACE_END
diff --git a/postgresql/src/storages/postgres/tests/query_queue_pgtest.cpp b/postgresql/src/storages/postgres/tests/query_queue_pgtest.cpp
@@ -51,6 +51,28 @@ UTEST_P(PostgreConnection, QueryQueueSelectMultiple) {
     }
 }
 
+UTEST_P(PostgreConnection, QueryQueueParametersStore) {
+    CheckConnection(GetConn());
+    if (!GetConn()->IsPipelineActive()) {
+        return;
+    }
+
+    using RowTuple = std::tuple<int, std::string>;
+    const auto values = RowTuple{1, "str"};
+
+    pg::QueryQueue query_queue{kDefaultCC, std::move(GetConn())};
+    pg::ParameterStore store;
+    store.PushBack(std::get<0>(values));
+    store.PushBack(std::get<1>(values));
+
+    UEXPECT_NO_THROW(query_queue.Push(kDefaultCC, "SELECT $1, $2", store));
+    QueryQueueResult result{};
+    UEXPECT_NO_THROW(result = query_queue.Collect(kCollectTimeout));
+
+    ASSERT_EQ(1, result.size());
+    EXPECT_EQ(values, result.front().AsSingleRow<RowTuple>(pg::kRowTag));
+}
+
 UTEST_P(PostgreConnection, QueryQueueTimeout) {
     CheckConnection(GetConn());
     if (!GetConn()->IsPipelineActive()) {