Postpone fetching of the data for cached results

This way if an object of the same type is loaded in between iteration, the fetched
image won't be messed up.

1 files changed, 9 insertions, 20 deletions

diff --git a/odb/mysql/statement.cxx b/odb/mysql/statement.cxx
index 0f21917..6edfa16 100644
--- a/odb/mysql/statement.cxx
+++ b/odb/mysql/statement.cxx
@@ -126,27 +126,20 @@ namespace odb
         if (!end_)
         {
           if (mysql_stmt_store_result (stmt_))
-          {
             throw database_exception (stmt_);
-          }
+
+          // mysql_stmt_num_rows() returns the number of rows that have been
+          // fetched by store_result.
+          //
+          size_ = rows_ + static_cast<size_t> (mysql_stmt_num_rows (stmt_));
         }
+        else
+          size_ = rows_;
 
         cached_ = true;
       }
     }
 
-    std::size_t select_statement::
-    result_size ()
-    {
-      if (!cached_)
-        throw result_not_cached ();
-
-      // mysql_stmt_num_rows() returns the number of rows that have been
-      // fetched by store_result.
-      //
-      return rows_ + static_cast<std::size_t> (mysql_stmt_num_rows (stmt_));
-    }
-
     select_statement::result select_statement::
     fetch ()
     {
@@ -167,9 +160,7 @@ namespace odb
       {
       case 0:
         {
-          if (!cached_)
-            rows_++;
-
+          rows_++;
           return success;
         }
       case MYSQL_NO_DATA:
@@ -179,9 +170,7 @@ namespace odb
         }
       case MYSQL_DATA_TRUNCATED:
         {
-          if (!cached_)
-            rows_++;
-
+          rows_++;
           return truncated;
         }
       default: