Rework statement interfaces wrt param/result passing

1 files changed, 11 insertions, 3 deletions

diff --git a/odb/mysql/object-statements.hxx b/odb/mysql/object-statements.hxx
index 9ea9933..0c20b1b 100644
--- a/odb/mysql/object-statements.hxx
+++ b/odb/mysql/object-statements.hxx
@@ -219,6 +219,12 @@ namespace odb
       void
       update_image_version (std::size_t v) {update_image_version_ = v;}
 
+      std::size_t
+      update_id_image_version () const { return update_id_image_version_;}
+
+      void
+      update_id_image_version (std::size_t v) {update_id_image_version_ = v;}
+
       binding&
       update_image_binding () {return update_image_binding_;}
 
@@ -287,7 +293,6 @@ namespace odb
             new (details::shared) update_statement_type (
               conn_,
               object_traits::update_statement,
-              id_image_binding_,
               update_image_binding_));
 
         return *update_;
@@ -360,10 +365,13 @@ namespace odb
       binding insert_image_binding_;
       MYSQL_BIND insert_image_bind_[insert_column_count];
 
-      // Update binding. The suffix of the bind array is object id. The
-      // update statement depends on this being one contiguous arrays.
+      // Update binding. Note that the id suffix is bound to id_image_
+      // below instead of image_ which makes this binding effectively
+      // bound to two images. As a result, we have to track versions
+      // for both of them.
       //
       std::size_t update_image_version_;
+      std::size_t update_id_image_version_;
       binding update_image_binding_;
       MYSQL_BIND update_image_bind_[update_column_count + id_column_count];