Add support for persistent classes without object ids

New pragma id (object). New test: common/no-id.

1 files changed, 102 insertions, 13 deletions

diff --git a/odb/sqlite/object-result.txx b/odb/sqlite/object-result.txx
index 6e3a0c9..dc258cc 100644
--- a/odb/sqlite/object-result.txx
+++ b/odb/sqlite/object-result.txx
@@ -12,17 +12,21 @@ namespace odb
 {
   namespace sqlite
   {
+    //
+    // object_result_impl
+    //
+
     template <typename T>
-    result_impl<T, class_object>::
-    ~result_impl ()
+    object_result_impl<T>::
+    ~object_result_impl ()
     {
     }
 
     template <typename T>
-    result_impl<T, class_object>::
-    result_impl (const query& q,
-                 details::shared_ptr<select_statement> statement,
-                 object_statements<object_type>& statements)
+    object_result_impl<T>::
+    object_result_impl (const query& q,
+                        details::shared_ptr<select_statement> statement,
+                        object_statements<object_type>& statements)
         : base_type (statements.connection ().database ()),
           result_impl_base (q, statement),
           statements_ (statements)
@@ -30,7 +34,7 @@ namespace odb
     }
 
     template <typename T>
-    void result_impl<T, class_object>::
+    void object_result_impl<T>::
     load (object_type& obj)
     {
       load_image ();
@@ -67,8 +71,8 @@ namespace odb
     }
 
     template <typename T>
-    typename result_impl<T, class_object>::id_type
-    result_impl<T, class_object>::
+    typename object_result_impl<T>::id_type
+    object_result_impl<T>::
     load_id ()
     {
       load_image ();
@@ -76,7 +80,7 @@ namespace odb
     }
 
     template <typename T>
-    void result_impl<T, class_object>::
+    void object_result_impl<T>::
     next ()
     {
       this->current (pointer_type ());
@@ -86,7 +90,7 @@ namespace odb
     }
 
     template <typename T>
-    void result_impl<T, class_object>::
+    void object_result_impl<T>::
     load_image ()
     {
       // The image can grow between calls to load() as a result of other
@@ -121,13 +125,98 @@ namespace odb
     }
 
     template <typename T>
-    void result_impl<T, class_object>::
+    void object_result_impl<T>::
+    cache ()
+    {
+    }
+
+    template <typename T>
+    std::size_t object_result_impl<T>::
+    size ()
+    {
+      throw result_not_cached ();
+    }
+
+    //
+    // object_result_impl_no_id
+    //
+
+    template <typename T>
+    object_result_impl_no_id<T>::
+    ~object_result_impl_no_id ()
+    {
+    }
+
+    template <typename T>
+    object_result_impl_no_id<T>::
+    object_result_impl_no_id (const query& q,
+                              details::shared_ptr<select_statement> statement,
+                              object_statements_no_id<object_type>& statements)
+        : base_type (statements.connection ().database ()),
+          result_impl_base (q, statement),
+          statements_ (statements)
+    {
+    }
+
+    template <typename T>
+    void object_result_impl_no_id<T>::
+    load (object_type& obj)
+    {
+      // The image can grow between calls to load() as a result of other
+      // statements execution.
+      //
+      typename object_traits::image_type& im (statements_.image ());
+
+      if (im.version != statements_.select_image_version ())
+      {
+        binding& b (statements_.select_image_binding ());
+        object_traits::bind (b.bind, im, statement_select);
+        statements_.select_image_version (im.version);
+        b.version++;
+      }
+
+      select_statement::result r (statement_->load ());
+
+      if (r == select_statement::truncated)
+      {
+        if (object_traits::grow (im, statements_.select_image_truncated ()))
+          im.version++;
+
+        if (im.version != statements_.select_image_version ())
+        {
+          binding& b (statements_.select_image_binding ());
+          object_traits::bind (b.bind, im, statement_select);
+          statements_.select_image_version (im.version);
+          b.version++;
+          statement_->reload ();
+        }
+      }
+
+      odb::database& db (this->database ());
+
+      object_traits::callback (db, obj, callback_event::pre_load);
+      object_traits::init (obj, im, db);
+      object_traits::callback (db, obj, callback_event::post_load);
+    }
+
+    template <typename T>
+    void object_result_impl_no_id<T>::
+    next ()
+    {
+      this->current (pointer_type ());
+
+      if (!statement_->next ())
+        this->end_ = true;
+    }
+
+    template <typename T>
+    void object_result_impl_no_id<T>::
     cache ()
     {
     }
 
     template <typename T>
-    std::size_t result_impl<T, class_object>::
+    std::size_t object_result_impl_no_id<T>::
     size ()
     {
       throw result_not_cached ();