Mutualize code into tryExecuteStep() from PR #142 using SQLITE_MISUSE when statement needs to be reseted

Author: SRombauts

include/SQLiteCpp/Statement.h

@@ -628,7 +628,7 @@ class Statement
     }
 
     /**
-     * @brief Check if there is a row of result returnes by executeStep(), else throw a SQLite::Exception.
+     * @brief Check if there is a row of result returned by executeStep(), else throw a SQLite::Exception.
      */
     inline void checkRow() const
     {

src/Statement.cpp

@@ -244,87 +244,65 @@ void Statement::bind(const char* apName)
 // Execute a step of the query to fetch one row of results
 bool Statement::executeStep()
 {
-    if (false == mbDone)
+    const int ret = tryExecuteStep();
+    if ((SQLITE_ROW != ret) && (SQLITE_DONE != ret)) // on row or no (more) row ready, else it's a problem
     {
-        const int ret = sqlite3_step(mStmtPtr);
-        if (SQLITE_ROW == ret) // one row is ready : call getColumn(N) to access it
-        {
-            mbOk = true;
-        }
-        else if (SQLITE_DONE == ret) // no (more) row ready : the query has finished executing
-        {
-            mbOk = false;
-            mbDone = true;
-        }
-        else
-        {
-            mbOk = false;
-            mbDone = false;
-            throw SQLite::Exception(mStmtPtr, ret);
-        }
-    }
-    else
-    {
-        throw SQLite::Exception("Statement needs to be reseted.");
+        throw SQLite::Exception(mStmtPtr, ret);
     }
 
     return mbOk; // true only if one row is accessible by getColumn(N)
 }
 
-int Statement::tryExecuteStep() noexcept
+// Execute a one-step query with no expected result
+int Statement::exec()
 {
-    const int ret = sqlite3_step(mStmtPtr);
-    if (SQLITE_ROW == ret) // one row is ready : call getColumn(N) to access it
-    {
-        mbOk = true;
-    }
-    else if (SQLITE_DONE == ret) // no (more) row ready : the query has finished executing
-    {
-        mbOk = false;
-        mbDone = true;
-    }
-    else
+    const int ret = tryExecuteStep();
+    if (SQLITE_DONE != ret) // the statement has finished executing successfully
     {
-        mbOk = false;
-        mbDone = false;
+        if (SQLITE_ROW == ret)
+        {
+            throw SQLite::Exception("exec() does not expect results. Use executeStep.");
+        }
+        else
+        {
+            throw SQLite::Exception(mStmtPtr, ret);
+        }
     }
 
-    return ret;
+    // Return the number of rows modified by those SQL statements (INSERT, UPDATE or DELETE)
+    return sqlite3_changes(mStmtPtr);
 }
 
-// Execute a one-step query with no expected result
-int Statement::exec()
+int Statement::tryExecuteStep() noexcept
 {
     if (false == mbDone)
     {
         const int ret = sqlite3_step(mStmtPtr);
-        if (SQLITE_DONE == ret) // the statement has finished executing successfully
+        if (SQLITE_ROW == ret) // one row is ready : call getColumn(N) to access it
         {
-            mbOk = false;
-            mbDone = true;
+            mbOk = true;
         }
-        else if (SQLITE_ROW == ret)
+        else if (SQLITE_DONE == ret) // no (more) row ready : the query has finished executing
         {
             mbOk = false;
-            mbDone = false;
-            throw SQLite::Exception("exec() does not expect results. Use executeStep.");
+            mbDone = true;
         }
         else
         {
             mbOk = false;
             mbDone = false;
-            throw SQLite::Exception(mStmtPtr, ret);
         }
+
+        return ret;
     }
     else
     {
-        throw SQLite::Exception("Statement need to be reseted.");
+        // Statement needs to be reseted !
+        return SQLITE_MISUSE;
     }
-
-    // Return the number of rows modified by those SQL statements (INSERT, UPDATE or DELETE)
-    return sqlite3_changes(mStmtPtr);
 }
 
+
 // Return a copy of the column data specified by its index starting at 0
 // (use the Column copy-constructor)
 Column Statement::getColumn(const int aIndex)