From 2a0a93be9256d982a2d15776b7ae52d1c47c8a1a Mon Sep 17 00:00:00 2001
From: t-horikawa <horikawa@nautilus-technologies.com>
Date: Wed, 6 Nov 2024 14:11:51 +0900
Subject: [PATCH] fix the use of SERVER_ERROR and SERVER_FAILURE

---
 src/ogawayama/stub/connection.cpp  | 8 ++++----
 src/ogawayama/stub/transaction.cpp | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ogawayama/stub/connection.cpp b/src/ogawayama/stub/connection.cpp
index ecc8f24..6a4b11f 100644
--- a/src/ogawayama/stub/connection.cpp
+++ b/src/ogawayama/stub/connection.cpp
@@ -91,7 +91,7 @@ ErrorCode Connection::Impl::begin(TransactionPtr& transaction)
         }
         return ErrorCode::SERVER_ERROR;
     } catch (std::runtime_error &e) {
-        return ErrorCode::SERVER_ERROR;
+        return ErrorCode::SERVER_FAILURE;
     }
 }
 
@@ -159,9 +159,9 @@ ErrorCode Connection::Impl::begin(const boost::property_tree::ptree& option, Tra
             transaction = std::make_unique<Transaction>(std::make_unique<Transaction::Impl>(this, transport_, response_begin.success().transaction_handle()));
             return ErrorCode::OK;
         }
-        return ErrorCode::SERVER_FAILURE;
-    } catch (std::runtime_error &e) {
         return ErrorCode::SERVER_ERROR;
+    } catch (std::runtime_error &e) {
+        return ErrorCode::SERVER_FAILURE;
     }
 }
 
@@ -232,7 +232,7 @@ ErrorCode Connection::Impl::prepare(std::string_view sql, const placeholders_typ
         }
         return ErrorCode::SERVER_ERROR;
     } catch (std::runtime_error &e) {
-        return ErrorCode::SERVER_ERROR;
+        return ErrorCode::SERVER_FAILURE;
     }
 }
 
diff --git a/src/ogawayama/stub/transaction.cpp b/src/ogawayama/stub/transaction.cpp
index e3acf03..88bb787 100644
--- a/src/ogawayama/stub/transaction.cpp
+++ b/src/ogawayama/stub/transaction.cpp
@@ -82,7 +82,7 @@ ErrorCode Transaction::Impl::execute_statement(std::string_view statement, std::
             }
             return ErrorCode::SERVER_ERROR;
         } catch (std::runtime_error &e) {
-            return ErrorCode::SERVER_ERROR;
+            return ErrorCode::SERVER_FAILURE;
         }
     }
     return ErrorCode::NO_TRANSACTION;
@@ -218,7 +218,7 @@ ErrorCode Transaction::Impl::execute_statement(PreparedStatementPtr& prepared, c
             }
             return ErrorCode::SERVER_ERROR;
         } catch (std::runtime_error &e) {
-            return ErrorCode::SERVER_ERROR;
+            return ErrorCode::SERVER_FAILURE;
         }
     }
     return ErrorCode::NO_TRANSACTION;
@@ -254,7 +254,7 @@ ErrorCode Transaction::Impl::execute_query(std::string_view query, std::shared_p
             );
             return ErrorCode::OK;
         } catch (std::runtime_error &e) {
-            return ErrorCode::SERVER_ERROR;
+            return ErrorCode::SERVER_FAILURE;
         }
     }
     return ErrorCode::NO_TRANSACTION;
@@ -301,7 +301,7 @@ ErrorCode Transaction::Impl::execute_query(PreparedStatementPtr& prepared, const
             );
             return ErrorCode::OK;
         } catch (std::runtime_error &e) {
-            return ErrorCode::SERVER_ERROR;
+            return ErrorCode::SERVER_FAILURE;
         }
     }
     return ErrorCode::NO_TRANSACTION;