From be5d50d5e68f2dbf904378480b26495249720320 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 18 Jun 2012 16:05:11 +0200
Subject: Remove unnecessary checks for current transaction

---
 odb/database.cxx | 3 ---
 odb/database.txx | 5 +++--
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'odb')

diff --git a/odb/database.cxx b/odb/database.cxx
index b9a6d80..5da6a40 100644
--- a/odb/database.cxx
+++ b/odb/database.cxx
@@ -14,9 +14,6 @@ namespace odb
   unsigned long long database::
   execute (const char* st, std::size_t n)
   {
-    if (!transaction::has_current ())
-      throw not_in_transaction ();
-
     connection_type& c (transaction::current ().connection ());
     return c.execute (st, n);
   }
diff --git a/odb/database.txx b/odb/database.txx
index 7f7b90f..7ac19d7 100644
--- a/odb/database.txx
+++ b/odb/database.txx
@@ -115,8 +115,9 @@ namespace odb
   {
     // T is always object_type.
     //
-    if (!transaction::has_current ())
-      throw not_in_transaction ();
+
+    // We don't need to check for transaction here;
+    // object_traits::query () does this.
 
     result<T> r (query_<T, class_traits<T>::kind>::call (*this, q));
 
-- 
cgit v1.1