diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2010-07-20 11:05:27 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2010-07-20 11:05:27 +0200 |
commit | 1ee222df81fc2ad5cef3236eb6d481b50699c2ab (patch) | |
tree | 26fd8801c8a8137f3a662588de99e94a0ed4faa9 | |
parent | 2c57577ac8995a83182190ae94e6b28f4715ca04 (diff) |
Get rid of the session mechanism for now
Add low-level API instead.
-rw-r--r-- | odb/tracer/database.cxx | 15 | ||||
-rw-r--r-- | odb/tracer/database.hxx | 3 | ||||
-rw-r--r-- | odb/tracer/transaction-impl.cxx | 7 | ||||
-rw-r--r-- | odb/tracer/transaction-impl.hxx | 1 |
4 files changed, 1 insertions, 25 deletions
diff --git a/odb/tracer/database.cxx b/odb/tracer/database.cxx index 5d59c16..74a87f2 100644 --- a/odb/tracer/database.cxx +++ b/odb/tracer/database.cxx @@ -3,7 +3,6 @@ // copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file -#include <odb/session.hxx> #include <odb/transaction.hxx> #include <odb/tracer/database.hxx> @@ -22,19 +21,7 @@ namespace odb if (odb::transaction::has_current ()) throw already_in_transaction (); - if (session::has_current ()) - return new transaction_impl (*this, session::current ()); - else - return new transaction_impl (*this); - } - - transaction_impl* database:: - begin_transaction (session& s) - { - if (odb::transaction::has_current ()) - throw already_in_transaction (); - - return new transaction_impl (*this, s); + return new transaction_impl (*this); } } } diff --git a/odb/tracer/database.hxx b/odb/tracer/database.hxx index 983f866..902a292 100644 --- a/odb/tracer/database.hxx +++ b/odb/tracer/database.hxx @@ -21,9 +21,6 @@ namespace odb virtual transaction_impl* begin_transaction (); - - virtual transaction_impl* - begin_transaction (session&); }; } } diff --git a/odb/tracer/transaction-impl.cxx b/odb/tracer/transaction-impl.cxx index 248ee61..d003fcb 100644 --- a/odb/tracer/transaction-impl.cxx +++ b/odb/tracer/transaction-impl.cxx @@ -23,13 +23,6 @@ namespace odb } transaction_impl:: - transaction_impl (database_type& db, session_type& s) - : odb::transaction_impl (db, s), finilized_ (false) - { - cout << "begin transaction" << endl; - } - - transaction_impl:: ~transaction_impl () { if (!finilized_) diff --git a/odb/tracer/transaction-impl.hxx b/odb/tracer/transaction-impl.hxx index 06fe849..92adb04 100644 --- a/odb/tracer/transaction-impl.hxx +++ b/odb/tracer/transaction-impl.hxx @@ -24,7 +24,6 @@ namespace odb typedef tracer::database database_type; transaction_impl (database_type&); - transaction_impl (database_type&, session_type&); virtual ~transaction_impl (); |