QueryResult. Update interface.

Author: lganzzzo

src/oatpp-postgresql/QueryResult.cpp

@@ -59,22 +59,22 @@ QueryResult::~QueryResult() {
   PQclear(m_dbResult);
 }
 
-bool QueryResult::isSuccess() {
+bool QueryResult::isSuccess() const {
   return m_success;
 }
 
-v_int64 QueryResult::count() {
+v_int64 QueryResult::position() const {
+  return m_resultData.rowIndex;
+}
+
+v_int64 QueryResult::count() const {
   switch(m_type) {
-    case TYPE_TUPLES: return PQntuples(m_dbResult);
+    case TYPE_TUPLES: return m_resultData.rowCount;
 //    case TYPE_COMMAND: return 0;
   }
   return 0;
 }
 
-std::vector<std::vector<oatpp::Void>> QueryResult::fetchRows(v_int64 count) {
-  return {};
-}
-
 void QueryResult::fetch(oatpp::Void& polymorph, v_int64 count) {
   polymorph = m_resultMapper->readRows(&m_resultData, polymorph.valueType, count);
 }

src/oatpp-postgresql/QueryResult.hpp

@@ -54,11 +54,11 @@ class QueryResult : public orm::QueryResult {
 
   ~QueryResult();
 
-  bool isSuccess() override;
+  bool isSuccess() const override;
 
-  v_int64 count() override;
+  v_int64 position() const override;
 
-  std::vector<std::vector<oatpp::Void>> fetchRows(v_int64 count) override;
+  v_int64 count() const override;
 
   void fetch(oatpp::Void& polymorph, v_int64 count) override;
 

test/oatpp-postgresql/tests.cpp

@@ -102,20 +102,17 @@ class Test : public oatpp::test::UnitTest {
     //client.insertFloats(0.32, 0.64, connection);
     //client.insertFloats(-0.32, -0.64, connection);
 
-    auto res = client.selectInts(connection);
-
-    OATPP_LOGD(TAG, "OK=%d, count=%d", res->isSuccess(), res->count());
-
     {
-      oatpp::Vector<oatpp::Fields<oatpp::Any>> resObjType;
-      oatpp::Void polymorph(resObjType.valueType);
 
-      res->fetch(polymorph, res->count());
+      auto res = client.selectInts(connection);
+      OATPP_LOGD(TAG, "OK=%d, count=%d", res->isSuccess(), res->count());
+
+      auto dataset = res->fetch<oatpp::Vector<oatpp::Fields<oatpp::Any>>>();
 
       oatpp::parser::json::mapping::ObjectMapper om;
       om.getSerializer()->getConfig()->useBeautifier = true;
 
-      auto str = om.writeToString(polymorph);
+      auto str = om.writeToString(dataset);
 
       OATPP_LOGD(TAG, "res=%s", str->c_str());