1 files changed, 18 insertions, 12 deletions

@@ -113,18 +113,20 @@ namespace hatkirby {
     {
       sqlite3_stmt* tempStmt;
 
-      if (sqlite3_prepare_v2(
+      int ret = sqlite3_prepare_v2(
         ppdb_.get(),
         query.c_str(),
         query.length(),
         &tempStmt,
-        NULL) != SQLITE_OK)
+        NULL);
+
+      ppstmt_type ppstmt(tempStmt);
+
+      if (ret != SQLITE_OK)
       {
         throw sqlite3_error("Error writing to database", ppdb_.get());
       }
 
-      ppstmt_type ppstmt(tempStmt);
-
       if (sqlite3_step(ppstmt.get()) != SQLITE_DONE)
       {
         throw sqlite3_error("Error writing to database", ppdb_.get());
@@ -157,18 +159,20 @@ namespace hatkirby {
 
       sqlite3_stmt* tempStmt;
 
-      if (sqlite3_prepare_v2(
+      int ret = sqlite3_prepare_v2(
         ppdb_.get(),
         query_str.c_str(),
         query_str.length(),
         &tempStmt,
-        NULL) != SQLITE_OK)
+        NULL);
+
+      ppstmt_type ppstmt(tempStmt);
+
+      if (ret != SQLITE_OK)
       {
         throw sqlite3_error("Error writing to database", ppdb_.get());
       }
 
-      ppstmt_type ppstmt(tempStmt);
-
       int i = 1;
       for (const column& c : columns)
       {
@@ -191,18 +195,20 @@ namespace hatkirby {
     {
       sqlite3_stmt* tempStmt;
 
-      if (sqlite3_prepare_v2(
+      int ret = sqlite3_prepare_v2(
         ppdb_.get(),
         queryString.c_str(),
         queryString.length(),
         &tempStmt,
-        NULL) != SQLITE_OK)
+        NULL);
+
+      ppstmt_type ppstmt(tempStmt);
+
+      if (ret != SQLITE_OK)
       {
         throw sqlite3_error("Error preparing query", ppdb_.get());
       }
 
-      ppstmt_type ppstmt(tempStmt);
-
       int i = 1;
       for (const binding& value : bindings)
       {