From 35c3d273bbf1bd8c9c41ac1c3d91f150df0eb280 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 18 Aug 2011 11:38:40 +0200
Subject: Fix custom recursive loading in post_load callback

Before we called the callback while holding the statements locked. As a
result, if the callback tried to load another object of this type, it
failed. Now we unlock the statements (since we have completely loaded
the object from ODB's point of view) and then call the callback. The
callback test has been updated to test this situation.
---
 odb/sqlite/object-statements.ixx | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'odb/sqlite/object-statements.ixx')

diff --git a/odb/sqlite/object-statements.ixx b/odb/sqlite/object-statements.ixx
index e1ae3ef..f629ea7 100644
--- a/odb/sqlite/object-statements.ixx
+++ b/odb/sqlite/object-statements.ixx
@@ -8,6 +8,22 @@ namespace odb
   namespace sqlite
   {
     //
+    // auto_unlock
+    //
+    inline object_statements_base::auto_unlock::
+    auto_unlock (object_statements_base& s)
+        : s_ (s)
+    {
+      s_.unlock ();
+    }
+
+    inline object_statements_base::auto_unlock::
+    ~auto_unlock ()
+    {
+      s_.lock ();
+    }
+
+    //
     // auto_lock
     //
     template <typename T>
-- 
cgit v1.1