Remove boost::optional in Transaction_Owner, get_transaction

zerebubuth · Jul 26, 2019 · 966a354 · 966a354
1 parent 4434438
commit 966a354
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/include/cgimap/backend/apidb/transaction_manager.hpp b/include/cgimap/backend/apidb/transaction_manager.hpp
@@ -14,7 +14,7 @@ class Transaction_Owner_Base
 {
 public:
   Transaction_Owner_Base() {}
-  virtual boost::optional<pqxx::transaction_base&> get_transaction() = 0;
+  virtual pqxx::transaction_base& get_transaction() = 0;
   virtual ~Transaction_Owner_Base() {}
 };
 
@@ -23,7 +23,7 @@ class Transaction_Owner_ReadOnly : public Transaction_Owner_Base
 {
 public:
   explicit Transaction_Owner_ReadOnly(pqxx::connection &conn);
-  virtual boost::optional<pqxx::transaction_base&> get_transaction();
+  virtual pqxx::transaction_base& get_transaction();
   ~Transaction_Owner_ReadOnly() {}
 
 private:
@@ -35,7 +35,7 @@ class Transaction_Owner_ReadWrite : public Transaction_Owner_Base
 {
 public:
   explicit Transaction_Owner_ReadWrite(pqxx::connection &conn);
-  virtual boost::optional<pqxx::transaction_base&> get_transaction();
+  virtual pqxx::transaction_base& get_transaction();
   ~Transaction_Owner_ReadWrite() {}
 
 private:
@@ -46,11 +46,11 @@ class Transaction_Owner_Void : public Transaction_Owner_Base
 {
 public:
   explicit Transaction_Owner_Void();
-  virtual boost::optional<pqxx::transaction_base&> get_transaction();
+  virtual pqxx::transaction_base& get_transaction();
   ~Transaction_Owner_Void() {}
 };
 
-/******************************************************************************************/
+
 
 class Transaction_Manager {
 

diff --git a/src/backend/apidb/transaction_manager.cpp b/src/backend/apidb/transaction_manager.cpp
@@ -7,14 +7,14 @@
 
 Transaction_Owner_ReadOnly::Transaction_Owner_ReadOnly( pqxx::connection &conn) : m_txn{ conn } {};
 
-boost::optional<pqxx::transaction_base&> Transaction_Owner_ReadOnly::get_transaction() { return m_txn; }
+pqxx::transaction_base& Transaction_Owner_ReadOnly::get_transaction() { return m_txn; }
 
 Transaction_Owner_ReadWrite::Transaction_Owner_ReadWrite( pqxx::connection &conn) : m_txn{ conn } {};
 
-boost::optional<pqxx::transaction_base&> Transaction_Owner_ReadWrite::get_transaction() { return m_txn; }
+pqxx::transaction_base& Transaction_Owner_ReadWrite::get_transaction() { return m_txn; }
 
 
-Transaction_Manager::Transaction_Manager(Transaction_Owner_Base &to) : m_txn{ *to.get_transaction() } {}
+Transaction_Manager::Transaction_Manager(Transaction_Owner_Base &to) : m_txn{ to.get_transaction() } {}
 
 void Transaction_Manager::prepare(const std::string &name,
                                   const std::string &definition) {

diff --git a/src/backend/staticxml/staticxml.cpp b/src/backend/staticxml/staticxml.cpp
@@ -17,7 +17,9 @@ using api06::id_version;
 
 Transaction_Owner_Void::Transaction_Owner_Void() {};
 
-boost::optional<pqxx::transaction_base&>Transaction_Owner_Void::get_transaction() { return boost::none; }
+pqxx::transaction_base& Transaction_Owner_Void::get_transaction() {
+  throw std::runtime_error ("get_transaction is not supported by Transaction_Owner_Void");
+}
 
 
 namespace {

diff --git a/test/test_basicauth.cpp b/test/test_basicauth.cpp
@@ -32,7 +32,9 @@
 
 Transaction_Owner_Void::Transaction_Owner_Void() {};
 
-boost::optional<pqxx::transaction_base&>Transaction_Owner_Void::get_transaction() { return boost::none; }
+pqxx::transaction_base& Transaction_Owner_Void::get_transaction() {
+  throw std::runtime_error("get_transaction is not supported by Transaction_Owner_Void");
+}
 
 namespace {