Implement Transactions.

Author: lganzzzo

src/oatpp-postgresql/Executor.cpp

@@ -163,6 +163,7 @@ data::share::StringTemplate Executor::parseQueryTemplate(const oatpp::String& na
   auto extra = std::make_shared<ql_template::Parser::TemplateExtra>();
   t.setExtraData(extra);
 
+  extra->prepare = prepare;
   extra->templateName = name;
   ql_template::TemplateValueProvider valueProvider;
   extra->preparedTemplate = t.format(&valueProvider);
@@ -181,8 +182,7 @@ std::shared_ptr<orm::Connection> Executor::getConnection() {
 
 std::shared_ptr<orm::QueryResult> Executor::execute(const StringTemplate& queryTemplate,
                                                     const std::unordered_map<oatpp::String, oatpp::Void>& params,
-                                                    const std::shared_ptr<orm::Connection>& connection,
-                                                    bool prepare)
+                                                    const std::shared_ptr<orm::Connection>& connection)
 {
 
   std::shared_ptr<orm::Connection> conn = connection;
@@ -193,6 +193,7 @@ std::shared_ptr<orm::QueryResult> Executor::execute(const StringTemplate& queryT
   auto pgConnection = std::static_pointer_cast<postgresql::Connection>(conn);
 
   auto extra = std::static_pointer_cast<ql_template::Parser::TemplateExtra>(queryTemplate.getExtraData());
+  bool prepare = extra->prepare;
 
   if(prepare) {
 
@@ -213,4 +214,29 @@ std::shared_ptr<orm::QueryResult> Executor::execute(const StringTemplate& queryT
 
 }
 
+std::shared_ptr<orm::QueryResult> Executor::begin(const std::shared_ptr<orm::Connection>& connection) {
+
+  std::shared_ptr<orm::Connection> conn = connection;
+  if(!conn) {
+    conn = getConnection();
+  }
+
+  auto pgConnection = std::static_pointer_cast<postgresql::Connection>(conn);
+  PGresult *qres = PQexec(pgConnection->getHandle(), "BEGIN");
+  return std::make_shared<QueryResult>(qres, pgConnection, m_connectionProvider, m_resultMapper);
+
+}
+
+std::shared_ptr<orm::QueryResult> Executor::commit(const std::shared_ptr<orm::Connection>& connection) {
+  auto pgConnection = std::static_pointer_cast<postgresql::Connection>(connection);
+  PGresult *qres = PQexec(pgConnection->getHandle(), "END");
+  return std::make_shared<QueryResult>(qres, pgConnection, m_connectionProvider, m_resultMapper);
+}
+
+std::shared_ptr<orm::QueryResult> Executor::rollback(const std::shared_ptr<orm::Connection>& connection) {
+  auto pgConnection = std::static_pointer_cast<postgresql::Connection>(connection);
+  PGresult *qres = PQexec(pgConnection->getHandle(), "ROLLBACK");
+  return std::make_shared<QueryResult>(qres, pgConnection, m_connectionProvider, m_resultMapper);
+}
+
 }}

src/oatpp-postgresql/Executor.hpp

@@ -96,8 +96,13 @@ class Executor : public orm::Executor {
 
   std::shared_ptr<orm::QueryResult> execute(const StringTemplate& queryTemplate,
                                             const std::unordered_map<oatpp::String, oatpp::Void>& params,
-                                            const std::shared_ptr<orm::Connection>& connection,
-                                            bool prepare) override;
+                                            const std::shared_ptr<orm::Connection>& connection) override;
+
+  std::shared_ptr<orm::QueryResult> begin(const std::shared_ptr<orm::Connection>& connection = nullptr) override;
+
+  std::shared_ptr<orm::QueryResult> commit(const std::shared_ptr<orm::Connection>& connection) override;
+
+  std::shared_ptr<orm::QueryResult> rollback(const std::shared_ptr<orm::Connection>& connection) override;
 
 };
 

src/oatpp-postgresql/QueryResult.cpp

@@ -70,6 +70,10 @@ QueryResult::~QueryResult() {
   PQclear(m_dbResult);
 }
 
+std::shared_ptr<orm::Connection> QueryResult::getConnection() const {
+  return m_connection;
+}
+
 bool QueryResult::isSuccess() const {
   return m_success;
 }
@@ -82,11 +86,11 @@ oatpp::String QueryResult::getErrorMessage() const {
   return nullptr;
 }
 
-v_int64 QueryResult::position() const {
+v_int64 QueryResult::getPosition() const {
   return m_resultData.rowIndex;
 }
 
-v_int64 QueryResult::count() const {
+v_int64 QueryResult::getCount() const {
   switch(m_type) {
     case TYPE_TUPLES: return m_resultData.rowCount;
 //    case TYPE_COMMAND: return 0;

src/oatpp-postgresql/QueryResult.hpp

@@ -56,13 +56,15 @@ class QueryResult : public orm::QueryResult {
 
   ~QueryResult();
 
+  std::shared_ptr<orm::Connection> getConnection() const override;
+
   bool isSuccess() const override;
 
   oatpp::String getErrorMessage() const override;
 
-  v_int64 position() const override;
+  v_int64 getPosition() const override;
 
-  v_int64 count() const override;
+  v_int64 getCount() const override;
 
   void fetch(oatpp::Void& polymorph, v_int64 count) override;
 

src/oatpp-postgresql/ql_template/Parser.hpp

@@ -40,6 +40,7 @@ class Parser {
     oatpp::String templateName;
     oatpp::String preparedTemplate;
     std::unique_ptr<Oid[]> paramTypes;
+    bool prepare;
 
   };
 

test/oatpp-postgresql/tests.cpp

@@ -125,6 +125,13 @@ class MyClient : public oatpp::orm::DbClient {
 
   QUERY(selectFloats, "SELECT * FROM test_floats")
 
+  std::shared_ptr<oatpp::orm::QueryResult> insertMultipleUsers() {
+    auto t = beginTransaction();
+    createUser("admin5", "AdMiN", "admin5@admin.com", t.getConnection());
+    createUser("admin6", "AdMiN", "admin6@admin.com", t.getConnection());
+    return t.commit();
+  }
+
 };
 
 #include OATPP_CODEGEN_END(DbClient)
@@ -188,10 +195,11 @@ class Test : public oatpp::test::UnitTest {
     {
 
       //auto res = client.createUser("admin1", "AdMiN", "admin1@admin.com");
-      auto res = client.selectUsers();
+      //auto res = client.selectUsers();
+      auto res = client.insertMultipleUsers();
 
       if(res->isSuccess()) {
-        OATPP_LOGD(TAG, "OK, count=%d", res->count());
+        OATPP_LOGD(TAG, "OK, count=%d", res->getCount());
       } else {
         auto message = res->getErrorMessage();
         OATPP_LOGD(TAG, "Error, message=%s", message->c_str());