From 7d52205f2b2fc9403b9ea46483e8a17746c6be35 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 7 Mar 2012 10:21:08 +0200
Subject: Use RAII to free select statement results

---
 odb/sqlite/object-result.txx | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'odb/sqlite/object-result.txx')

diff --git a/odb/sqlite/object-result.txx b/odb/sqlite/object-result.txx
index a6b4e50..39dcdd7 100644
--- a/odb/sqlite/object-result.txx
+++ b/odb/sqlite/object-result.txx
@@ -21,6 +21,8 @@ namespace odb
     object_result_impl<T>::
     ~object_result_impl ()
     {
+      if (!this->end_)
+        statement_->free_result ();
     }
 
     template <typename T>
@@ -88,7 +90,10 @@ namespace odb
       this->current (pointer_type ());
 
       if (!statement_->next ())
+      {
+        statement_->free_result ();
         this->end_ = true;
+      }
     }
 
     template <typename T>
@@ -147,6 +152,8 @@ namespace odb
     object_result_impl_no_id<T>::
     ~object_result_impl_no_id ()
     {
+      if (!this->end_)
+        statement_->free_result ();
     }
 
     template <typename T>
@@ -208,7 +215,10 @@ namespace odb
       this->current (pointer_type ());
 
       if (!statement_->next ())
+      {
+        statement_->free_result ();
         this->end_ = true;
+      }
     }
 
     template <typename T>
-- 
cgit v1.1