Add container-statements, object-statments, view-statements and statement cache

12 files changed, 1267 insertions, 0 deletions

diff --git a/odb/oracle/container-statements.hxx b/odb/oracle/container-statements.hxx
new file mode 100644
index 0000000..23d2b45
--- /dev/null
+++ b/odb/oracle/container-statements.hxx
@@ -0,0 +1,274 @@
+// file      : odb/oracle/container-statements.hxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_ORACLE_CONTAINER_STATEMENTS_HXX
+#define ODB_ORACLE_CONTAINER_STATEMENTS_HXX
+
+#include <odb/pre.hxx>
+
+#include <cstddef> // std::size_t
+
+#include <odb/forward.hxx>
+#include <odb/traits.hxx>
+
+#include <odb/oracle/version.hxx>
+#include <odb/oracle/oracle-types.hxx>
+#include <odb/oracle/oracle-fwd.hxx>    // sb2
+#include <odb/oracle/statement.hxx>
+
+#include <odb/oracle/details/export.hxx>
+
+namespace odb
+{
+  namespace oracle
+  {
+    class connection;
+
+    // Template argument is the generated abstract container traits type.
+    // That is, it doesn't need to provide column counts and statements.
+    //
+    template <typename T>
+    class container_statements
+    {
+    public:
+      typedef T traits;
+
+      typedef typename traits::data_image_type data_image_type;
+      typedef typename traits::cond_image_type cond_image_type;
+
+      typedef typename traits::functions_type functions_type;
+
+      typedef oracle::insert_statement insert_statement_type;
+      typedef oracle::select_statement select_statement_type;
+      typedef oracle::delete_statement delete_statement_type;
+
+      typedef oracle::connection connection_type;
+
+      container_statements (connection_type&);
+
+      connection_type&
+      connection ()
+      {
+        return conn_;
+      }
+
+      // Functions.
+      //
+      functions_type&
+      functions ()
+      {
+        return functions_;
+      }
+
+      // Id image binding (external).
+      //
+      const binding&
+      id_binding ()
+      {
+        return *id_binding_;
+      }
+
+      void
+      id_binding (const binding& b)
+      {
+        id_binding_ = &b;
+      }
+
+      // Condition image.
+      //
+      cond_image_type&
+      cond_image ()
+      {
+        return cond_image_;
+      }
+
+      std::size_t
+      cond_image_version () const
+      {
+        return cond_image_version_;
+      }
+
+      void
+      cond_image_version (std::size_t v)
+      {
+        cond_image_version_ = v;
+      }
+
+      std::size_t
+      cond_id_binding_version () const
+      {
+        return cond_id_binding_version_;
+      }
+
+      void
+      cond_id_binding_version (std::size_t v)
+      {
+        cond_id_binding_version_ = v;
+      }
+
+      binding&
+      cond_image_binding ()
+      {
+        return cond_image_binding_;
+      }
+
+      sb2*
+      cond_image_indicator ()
+      {
+        return cond_image_indicator_;
+      }
+
+      // Data image.
+      //
+      data_image_type&
+      data_image ()
+      {
+        return data_image_;
+      }
+
+      std::size_t
+      data_image_version () const
+      {
+        return data_image_version_;
+      }
+
+      void
+      data_image_version (std::size_t v)
+      {
+        data_image_version_ = v;
+      }
+
+      std::size_t
+      data_id_binding_version () const
+      {
+        return data_id_binding_version_;
+      }
+
+      void
+      data_id_binding_version (std::size_t v)
+      {
+        data_id_binding_version_ = v;
+      }
+
+      binding&
+      data_image_binding ()
+      {
+        return data_image_binding_;
+      }
+
+      sb2*
+      data_image_indicator ()
+      {
+        return data_image_indicator_;
+      }
+
+      //
+      // Statements.
+      //
+
+      insert_statement_type&
+      insert_one_statement ()
+      {
+        // Containers never use auto ids so hardcode the insert_statement
+        // constructors returning argument as false.
+        //
+        if (insert_one_ == 0)
+          insert_one_.reset (
+            new (details::shared) insert_statement_type (
+              conn_, insert_one_text_, data_image_binding_, false));
+
+        return *insert_one_;
+      }
+
+      select_statement_type&
+      select_all_statement ()
+      {
+        if (select_all_ == 0)
+          select_all_.reset (
+            new (details::shared) select_statement_type (
+              conn_,
+              select_all_text_,
+              cond_image_binding_,
+              data_image_binding_,
+              4096));  // Hardcode a 4kB LOB prefetch size.
+
+        return *select_all_;
+      }
+
+      delete_statement_type&
+      delete_all_statement ()
+      {
+        if (delete_all_ == 0)
+          delete_all_.reset (
+            new (details::shared) delete_statement_type (
+              conn_, delete_all_text_, cond_image_binding_));
+
+        return *delete_all_;
+      }
+
+    private:
+      container_statements (const container_statements&);
+      container_statements& operator= (const container_statements&);
+
+    protected:
+      connection_type& conn_;
+      functions_type functions_;
+
+      const binding* id_binding_;
+
+      cond_image_type cond_image_;
+      std::size_t cond_image_version_;
+      std::size_t cond_id_binding_version_;
+      binding cond_image_binding_;
+      bind* cond_image_bind_;
+      sb2* cond_image_indicator_;
+
+      data_image_type data_image_;
+      std::size_t data_image_version_;
+      std::size_t data_id_binding_version_;
+      binding data_image_binding_;
+      bind* data_image_bind_;
+      sb2* data_image_indicator_;
+
+      const char* insert_one_text_;
+      const char* select_all_text_;
+      const char* delete_all_text_;
+
+      details::shared_ptr<insert_statement_type> insert_one_;
+      details::shared_ptr<select_statement_type> select_all_;
+      details::shared_ptr<delete_statement_type> delete_all_;
+    };
+
+    // Template argument is the generated concrete container traits type.
+    //
+    template <typename T>
+    class container_statements_impl: public T::statements_type
+    {
+    public:
+      typedef T traits;
+      typedef typename T::statements_type base;
+      typedef oracle::connection connection_type;
+
+      container_statements_impl (connection_type&);
+
+    private:
+      container_statements_impl (const container_statements_impl&);
+      container_statements_impl& operator= (const container_statements_impl&);
+
+    private:
+      bind cond_image_bind_array_[traits::cond_column_count];
+      sb2 cond_image_indicator_array_[traits::cond_column_count];
+
+      bind data_image_bind_array_[traits::data_column_count];
+      sb2 data_image_indicator_array_[traits::data_column_count];
+    };
+  }
+}
+
+#include <odb/oracle/container-statements.txx>
+
+#include <odb/post.hxx>
+
+#endif // ODB_ORACLE_CONTAINER_STATEMENTS_HXX
diff --git a/odb/oracle/container-statements.txx b/odb/oracle/container-statements.txx
new file mode 100644
index 0000000..e7dcb06
--- /dev/null
+++ b/odb/oracle/container-statements.txx
@@ -0,0 +1,75 @@
+// file      : odb/oracle/container-statements.txx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#include <cstddef> // std::size_t
+#include <cstring> // std::memset
+
+namespace odb
+{
+  namespace oracle
+  {
+    // container_statements
+    //
+
+    template <typename T>
+    container_statements<T>::
+    container_statements (connection_type& conn)
+        : conn_ (conn),
+          functions_ (this,
+                      &traits::insert_one,
+                      &traits::load_all,
+                      &traits::delete_all),
+          id_binding_ (0),
+          cond_image_binding_ (0, 0), // Initialized by impl.
+          data_image_binding_ (0, 0)  // Initialized by impl.
+    {
+      cond_image_.version = 0;
+      cond_image_version_ = 0;
+      cond_id_binding_version_ = 0;
+
+      data_image_.version = 0;
+      data_image_version_ = 0;
+      data_id_binding_version_ = 0;
+    }
+
+    template <typename T>
+    container_statements_impl<T>::
+    container_statements_impl (connection_type& conn)
+        : base (conn)
+    {
+      this->cond_image_bind_ = cond_image_bind_array_;
+      this->cond_image_indicator_ = cond_image_indicator_array_;
+
+      this->data_image_bind_ = data_image_bind_array_;
+      this->data_image_indicator_ = data_image_indicator_array_;
+
+      this->cond_image_binding_.bind = this->cond_image_bind_;
+      this->cond_image_binding_.count = traits::cond_column_count;
+
+      this->data_image_binding_.bind = this->data_image_bind_;
+      this->data_image_binding_.count = traits::data_column_count;
+
+      std::memset (cond_image_bind_array_, 0, sizeof (cond_image_bind_array_));
+      std::memset (cond_image_indicator_array_,
+                   0,
+                   sizeof (cond_image_indicator_array_));
+
+      for (std::size_t i (0); i < traits::cond_column_count; ++i)
+        cond_image_bind_array_[i].indicator = cond_image_indicator_array_ + i;
+
+      std::memset (data_image_bind_array_, 0, sizeof (data_image_bind_array_));
+      std::memset (data_image_indicator_array_,
+                   0,
+                   sizeof (data_image_indicator_array_));
+
+      for (std::size_t i (0); i < traits::data_column_count; ++i)
+        data_image_bind_array_[i].indicator = data_image_indicator_array_ + i;
+
+      this->insert_one_text_ = traits::insert_one_statement;
+      this->select_all_text_ = traits::select_all_statement;
+      this->delete_all_text_ = traits::delete_all_statement;
+    }
+  }
+}
diff --git a/odb/oracle/makefile b/odb/oracle/makefile
index 7f16e5d..cfa42ae 100644
--- a/odb/oracle/makefile
+++ b/odb/oracle/makefile
@@ -13,7 +13,9 @@ connection-factory.cxx   \
 database.cxx             \
 error.cxx                \
 exceptions.cxx           \
+object-statements.cxx    \
 statement.cxx            \
+statements-base.cxx      \
 transaction.cxx          \
 transaction-impl.cxx
 
diff --git a/odb/oracle/object-statements.cxx b/odb/oracle/object-statements.cxx
new file mode 100644
index 0000000..fb64823
--- /dev/null
+++ b/odb/oracle/object-statements.cxx
@@ -0,0 +1,17 @@
+// file      : odb/oracle/object-statements.cxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#include <odb/oracle/object-statements.hxx>
+
+namespace odb
+{
+  namespace oracle
+  {
+    object_statements_base::
+    ~object_statements_base ()
+    {
+    }
+  }
+}
diff --git a/odb/oracle/object-statements.hxx b/odb/oracle/object-statements.hxx
new file mode 100644
index 0000000..284bb53
--- /dev/null
+++ b/odb/oracle/object-statements.hxx
@@ -0,0 +1,414 @@
+// file      : odb/oracle/object-statements.hxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_ORACLE_OBJECT_STATEMENTS_HXX
+#define ODB_ORACLE_OBJECT_STATEMENTS_HXX
+
+#include <odb/pre.hxx>
+
+#include <vector>
+#include <cassert>
+#include <cstddef> // std::size_t
+
+#include <odb/forward.hxx>
+#include <odb/traits.hxx>
+#include <odb/cache-traits.hxx>
+
+#include <odb/details/shared-ptr.hxx>
+
+#include <odb/oracle/version.hxx>
+#include <odb/oracle/oracle-types.hxx>
+#include <odb/oracle/oracle-fwd.hxx>   // sb2
+#include <odb/oracle/statement.hxx>
+#include <odb/oracle/statements-base.hxx>
+
+#include <odb/oracle/details/export.hxx>
+
+namespace odb
+{
+  namespace oracle
+  {
+    class LIBODB_ORACLE_EXPORT object_statements_base: public statements_base
+    {
+      // Locking.
+      //
+    public:
+      void
+      lock ()
+      {
+        assert (!locked_);
+        locked_ = true;
+      }
+
+      void
+      unlock ()
+      {
+        assert (locked_);
+        locked_ = false;
+      }
+
+      bool
+      locked () const
+      {
+        return locked_;
+      }
+
+    public:
+      virtual
+      ~object_statements_base ();
+
+    protected:
+      object_statements_base (connection_type& conn)
+        : statements_base (conn), locked_ (false)
+      {
+      }
+
+      struct auto_unlock
+      {
+        // Unlocks the statement on construction and re-locks it on
+        // destruction.
+        //
+        auto_unlock (object_statements_base&);
+        ~auto_unlock ();
+
+      private:
+        auto_unlock (const auto_unlock&);
+        auto_unlock& operator= (const auto_unlock&);
+
+      private:
+        object_statements_base& s_;
+      };
+
+    protected:
+      bool locked_;
+    };
+
+    template <typename T>
+    class object_statements: public object_statements_base
+    {
+    public:
+      typedef T object_type;
+      typedef odb::object_traits<object_type> object_traits;
+      typedef typename object_traits::id_type id_type;
+      typedef typename object_traits::pointer_type pointer_type;
+      typedef typename object_traits::image_type image_type;
+      typedef typename object_traits::id_image_type id_image_type;
+
+      typedef pointer_cache_traits<pointer_type> object_cache_traits;
+
+      typedef
+      typename object_traits::container_statement_cache_type
+      container_statement_cache_type;
+
+      typedef oracle::insert_statement persist_statement_type;
+      typedef oracle::select_statement find_statement_type;
+      typedef oracle::update_statement update_statement_type;
+      typedef oracle::delete_statement erase_statement_type;
+
+      // Automatic lock.
+      //
+      struct auto_lock
+      {
+        // Lock the statements unless they are already locked in which
+        // case subsequent calls to locked() will return false.
+        //
+        auto_lock (object_statements&);
+
+        // Unlock the statements if we are holding the lock and clear
+        // the delayed loads. This should only happen in case an
+        // exception is thrown. In normal circumstances, the user
+        // should call unlock() explicitly.
+        //
+        ~auto_lock ();
+
+        // Return true if this auto_lock instance holds the lock.
+        //
+        bool
+        locked () const;
+
+        // Unlock the statements.
+        //
+        void
+        unlock ();
+
+      private:
+        auto_lock (const auto_lock&);
+        auto_lock& operator= (const auto_lock&);
+
+      private:
+        object_statements& s_;
+        bool locked_;
+      };
+
+    public:
+      object_statements (connection_type&);
+
+      virtual
+      ~object_statements ();
+
+      // Delayed loading.
+      //
+      void
+      delay_load (const id_type& id,
+                  object_type& obj,
+                  const typename object_cache_traits::position_type& p)
+      {
+        delayed_.push_back (delayed_load (id, obj, p));
+      }
+
+      void
+      load_delayed ()
+      {
+        assert (locked ());
+
+        if (!delayed_.empty ())
+          load_delayed_ ();
+      }
+
+      void
+      clear_delayed ()
+      {
+        if (!delayed_.empty ())
+          clear_delayed_ ();
+      }
+
+      // Object image.
+      //
+      image_type&
+      image ()
+      {
+        return image_;
+      }
+
+      std::size_t
+      in_image_version () const
+      {
+        return in_image_version_;
+      }
+
+      std::size_t
+      out_image_version () const
+      {
+        return out_image_version_;
+      }
+
+      void
+      in_image_version (std::size_t v)
+      {
+        in_image_version_ = v;
+      }
+
+      void
+      out_image_version (std::size_t v)
+      {
+        out_image_version_ = v;
+      }
+
+      binding&
+      in_image_binding ()
+      {
+        return in_image_binding_;
+      }
+
+      sb2*
+      in_image_indicator ()
+      {
+        return in_image_indicator_;
+      }
+
+      binding&
+      out_image_binding ()
+      {
+        return out_image_binding_;
+      }
+
+      sb2*
+      out_image_indicator ()
+      {
+        return out_image_indicator_;
+      }
+
+      // Object id image.
+      //
+      id_image_type&
+      id_image ()
+      {
+        return id_image_;
+      }
+
+      std::size_t
+      id_image_version () const
+      {
+        return id_image_version_;
+      }
+
+      void
+      id_image_version (std::size_t v)
+      {
+        id_image_version_ = v;
+      }
+
+      binding&
+      id_image_binding ()
+      {
+        return id_image_binding_;
+      }
+
+      persist_statement_type&
+      persist_statement ()
+      {
+        if (persist_ == 0)
+          persist_.reset (
+            new (details::shared) persist_statement_type (
+              conn_,
+              object_traits::persist_statement,
+              in_image_binding_,
+              object_traits::auto_id));
+
+        return *persist_;
+      }
+
+      find_statement_type&
+      find_statement ()
+      {
+        if (find_ == 0)
+          find_.reset (
+            new (details::shared) find_statement_type (
+              conn_,
+              object_traits::find_statement,
+              id_image_binding_,
+              out_image_binding_,
+              4096));  // Hardcode a 4kB LOB prefetch size.
+
+        return *find_;
+      }
+
+      update_statement_type&
+      update_statement ()
+      {
+        if (update_ == 0)
+          update_.reset (
+            new (details::shared) update_statement_type (
+              conn_,
+              object_traits::update_statement,
+              id_image_binding_,
+              in_image_binding_));
+
+        return *update_;
+      }
+
+      erase_statement_type&
+      erase_statement ()
+      {
+        if (erase_ == 0)
+          erase_.reset (
+            new (details::shared) erase_statement_type (
+              conn_,
+              object_traits::erase_statement,
+              id_image_binding_));
+
+        return *erase_;
+      }
+
+      // Container statement cache.
+      //
+      container_statement_cache_type&
+      container_statment_cache ()
+      {
+        return container_statement_cache_;
+      }
+
+    private:
+      object_statements (const object_statements&);
+      object_statements& operator= (const object_statements&);
+
+    private:
+      void
+      load_delayed_ ();
+
+      void
+      clear_delayed_ ();
+
+    private:
+      container_statement_cache_type container_statement_cache_;
+
+      image_type image_;
+
+      // In (send) binding. The last element is the id parameter.
+      //
+      std::size_t in_image_version_;
+      binding in_image_binding_;
+      bind in_image_bind_[object_traits::in_column_count + 1];
+      sb2 in_image_indicator_[object_traits::in_column_count + 1];
+
+      // Out (receive) binding.
+      //
+      std::size_t out_image_version_;
+      binding out_image_binding_;
+      bind out_image_bind_[object_traits::out_column_count];
+      sb2 out_image_indicator_[object_traits::out_column_count];
+
+      // Id image binding (in only)
+      //
+      id_image_type id_image_;
+      std::size_t id_image_version_;
+      binding id_image_binding_;
+
+      details::shared_ptr<persist_statement_type> persist_;
+      details::shared_ptr<find_statement_type> find_;
+      details::shared_ptr<update_statement_type> update_;
+      details::shared_ptr<erase_statement_type> erase_;
+
+      // Delayed loading.
+      //
+      struct delayed_load
+      {
+        typedef typename object_cache_traits::position_type position_type;
+
+        delayed_load () {}
+        delayed_load (const id_type& i, object_type& o, const position_type& p)
+            : id (i), obj (&o), pos (p)
+        {
+        }
+
+        id_type id;
+        object_type* obj;
+        position_type pos;
+      };
+
+      typedef std::vector<delayed_load> delayed_loads;
+      delayed_loads delayed_;
+
+      // Delayed vectors swap guard. See the load_delayed_() function for
+      // details.
+      //
+      struct swap_guard
+      {
+        swap_guard (object_statements& os, delayed_loads& dl)
+            : os_ (os), dl_ (dl)
+        {
+          dl_.swap (os_.delayed_);
+        }
+
+        ~swap_guard ()
+        {
+          os_.clear_delayed ();
+          dl_.swap (os_.delayed_);
+        }
+
+      private:
+        object_statements& os_;
+        delayed_loads& dl_;
+      };
+    };
+  }
+}
+
+#include <odb/oracle/object-statements.ixx>
+#include <odb/oracle/object-statements.txx>
+
+#include <odb/post.hxx>
+
+#endif // ODB_ORACLE_OBJECT_STATEMENTS_HXX
diff --git a/odb/oracle/object-statements.ixx b/odb/oracle/object-statements.ixx
new file mode 100644
index 0000000..0121bd8
--- /dev/null
+++ b/odb/oracle/object-statements.ixx
@@ -0,0 +1,70 @@
+// file      : odb/oracle/object-statements.ixx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+namespace odb
+{
+  namespace oracle
+  {
+    //
+    // 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>
+    inline object_statements<T>::auto_lock::
+    auto_lock (object_statements& s)
+        : s_ (s)
+    {
+      if (!s_.locked ())
+      {
+        s_.lock ();
+        locked_ = true;
+      }
+      else
+        locked_ = false;
+    }
+
+    template <typename T>
+    inline object_statements<T>::auto_lock::
+    ~auto_lock ()
+    {
+      if (locked_)
+      {
+        s_.unlock ();
+        s_.clear_delayed ();
+      }
+    }
+
+    template <typename T>
+    inline bool object_statements<T>::auto_lock::
+    locked () const
+    {
+      return locked_;
+    }
+
+    template <typename T>
+    inline void object_statements<T>::auto_lock::
+    unlock ()
+    {
+      assert (locked_);
+      s_.unlock ();
+      locked_ = false;
+    }
+  }
+}
diff --git a/odb/oracle/object-statements.txx b/odb/oracle/object-statements.txx
new file mode 100644
index 0000000..c3c5531
--- /dev/null
+++ b/odb/oracle/object-statements.txx
@@ -0,0 +1,118 @@
+// file      : odb/oracle/object-statements.txx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#include <cstddef> // std::size_t
+#include <cstring> // std::memset
+
+#include <odb/session.hxx>
+#include <odb/callback.hxx>
+#include <odb/exceptions.hxx>
+
+#include <odb/oracle/connection.hxx>
+
+namespace odb
+{
+  namespace oracle
+  {
+    template <typename T>
+    object_statements<T>::
+    ~object_statements ()
+    {
+    }
+
+    template <typename T>
+    object_statements<T>::
+    object_statements (connection_type& conn)
+        : object_statements_base (conn),
+          container_statement_cache_ (conn),
+          in_image_binding_ (in_image_bind_, object_traits::in_column_count),
+          out_image_binding_ (out_image_bind_, object_traits::out_column_count),
+          id_image_binding_ (in_image_bind_ + object_traits::in_column_count, 1)
+    {
+      image_.version = 0;
+      in_image_version_ = 0;
+      out_image_version_ = 0;
+
+      id_image_.version = 0;
+      id_image_version_ = 0;
+
+      std::memset (in_image_bind_, 0, sizeof (in_image_bind_));
+      std::memset (in_image_indicator_, 0, sizeof (in_image_indicator_));
+      std::memset (out_image_bind_, 0, sizeof (out_image_bind_));
+      std::memset (out_image_indicator_, 0, sizeof (out_image_indicator_));
+
+      for (std::size_t i (0); i < object_traits::in_column_count + 1; ++i)
+        in_image_bind_[i].indicator = in_image_indicator_ + i;
+
+      for (std::size_t i (0); i < object_traits::out_column_count; ++i)
+        out_image_bind_[i].indicator = out_image_indicator_ + i;
+    }
+
+    template <typename T>
+    void object_statements<T>::
+    load_delayed_ ()
+    {
+      database& db (connection ().database ());
+
+      delayed_loads dls;
+      swap_guard sg (*this, dls);
+
+      while (!dls.empty ())
+      {
+        delayed_load l (dls.back ());
+        typename object_cache_traits::insert_guard g (l.pos);
+        dls.pop_back ();
+
+        if (!object_traits::find_ (*this, l.id))
+          throw object_not_persistent ();
+
+        object_traits::callback (db, *l.obj, callback_event::pre_load);
+
+        // Our calls to init/load below can result in additional delayed
+        // loads being added to the delayed_ vector. We need to process
+        // those before we call the post callback.
+        //
+        object_traits::init (*l.obj, image (), db);
+        object_traits::load_ (*this, *l.obj); // Load containers, etc.
+
+        if (!delayed_.empty ())
+          load_delayed_ ();
+
+        // Temporarily unlock the statement for the post_load call so that
+        // it can load objects of this type recursively. This is safe to do
+        // because we have completely loaded the current object. Also the
+        // delayed_ list is clear before the unlock and should be clear on
+        // re-lock (since a callback can only call public API functions
+        // which will make sure all the delayed loads are processed before
+        // returning).
+        //
+        {
+          auto_unlock u (*this);
+          object_traits::callback (db, *l.obj, callback_event::post_load);
+        }
+
+        g.release ();
+      }
+    }
+
+    template <typename T>
+    void object_statements<T>::
+    clear_delayed_ ()
+    {
+      // Remove the objects from the session cache.
+      //
+      if (session::has_current ())
+      {
+        for (typename delayed_loads::iterator i (delayed_.begin ()),
+               e (delayed_.end ()); i != e; ++i)
+        {
+          object_cache_traits::erase (i->pos);
+        }
+      }
+
+      delayed_.clear ();
+    }
+  }
+}
diff --git a/odb/oracle/statement-cache.hxx b/odb/oracle/statement-cache.hxx
new file mode 100644
index 0000000..50b0744
--- /dev/null
+++ b/odb/oracle/statement-cache.hxx
@@ -0,0 +1,85 @@
+// file      : odb/oracle/statement-cache.hxx
+// author    : Constantin Michael <constantin@codesynthesis.com>
+// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_ORACLE_STATEMENT_CACHE_HXX
+#define ODB_ORACLE_STATEMENT_CACHE_HXX
+
+#include <odb/pre.hxx>
+
+#include <map>
+#include <typeinfo>
+
+#include <odb/forward.hxx>
+
+#include <odb/oracle/version.hxx>
+#include <odb/oracle/statements-base.hxx>
+#include <odb/oracle/object-statements.hxx>
+#include <odb/oracle/view-statements.hxx>
+
+#include <odb/details/shared-ptr.hxx>
+#include <odb/details/type-info.hxx>
+
+#include <odb/oracle/details/export.hxx>
+
+namespace odb
+{
+  namespace oracle
+  {
+    class connection;
+
+    class LIBODB_ORACLE_EXPORT statement_cache
+    {
+    public:
+      statement_cache (connection& conn)
+          : conn_ (conn)
+      {
+      }
+
+      template <typename T>
+      object_statements<T>&
+      find_object ()
+      {
+        map::iterator i (map_.find (&typeid (T)));
+
+        if (i != map_.end ())
+          return static_cast<object_statements<T>&> (*i->second);
+
+        details::shared_ptr<object_statements<T> > p (
+          new (details::shared) object_statements<T> (conn_));
+
+        map_.insert (map::value_type (&typeid (T), p));
+        return *p;
+      }
+
+      template <typename T>
+      view_statements<T>&
+      find_view ()
+      {
+        map::iterator i (map_.find (&typeid (T)));
+
+        if (i != map_.end ())
+          return static_cast<view_statements<T>&> (*i->second);
+
+        details::shared_ptr<view_statements<T> > p (
+          new (details::shared) view_statements<T> (conn_));
+
+        map_.insert (map::value_type (&typeid (T), p));
+        return *p;
+      }
+
+    private:
+      typedef std::map<const std::type_info*,
+                       details::shared_ptr<statements_base>,
+                       details::type_info_comparator> map;
+
+      connection& conn_;
+      map map_;
+    };
+  }
+}
+
+#include <odb/post.hxx>
+
+#endif // ODB_ORACLE_STATEMENT_CACHE_HXX
diff --git a/odb/oracle/statements-base.cxx b/odb/oracle/statements-base.cxx
new file mode 100644
index 0000000..3a33540
--- /dev/null
+++ b/odb/oracle/statements-base.cxx
@@ -0,0 +1,17 @@
+// file      : odb/oracle/statements-base.cxx
+// author    : Constantin Michael <constantin@codesynthesis.com>
+// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#include <odb/oracle/statements-base.hxx>
+
+namespace odb
+{
+  namespace oracle
+  {
+    statements_base::
+    ~statements_base ()
+    {
+    }
+  }
+}
diff --git a/odb/oracle/statements-base.hxx b/odb/oracle/statements-base.hxx
new file mode 100644
index 0000000..7f63d3e
--- /dev/null
+++ b/odb/oracle/statements-base.hxx
@@ -0,0 +1,51 @@
+// file      : odb/oracle/statements-base.hxx
+// author    : Constantin Michael <constantin@codesynthesis.com>
+// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_ORACLE_STATEMENTS_BASE_HXX
+#define ODB_ORACLE_STATEMENTS_BASE_HXX
+
+#include <odb/pre.hxx>
+
+#include <odb/details/shared-ptr.hxx>
+
+#include <odb/oracle/version.hxx>
+#include <odb/oracle/forward.hxx> // connection
+
+#include <odb/oracle/details/export.hxx>
+
+namespace odb
+{
+  namespace oracle
+  {
+    class LIBODB_ORACLE_EXPORT statements_base: public details::shared_base
+    {
+    public:
+      typedef oracle::connection connection_type;
+
+      connection_type&
+      connection ()
+      {
+        return conn_;
+      }
+
+    public:
+      virtual
+      ~statements_base ();
+
+    protected:
+      statements_base (connection_type& conn)
+        : conn_ (conn)
+      {
+      }
+
+    protected:
+      connection_type& conn_;
+    };
+  }
+}
+
+#include <odb/post.hxx>
+
+#endif // ODB_ORACLE_STATEMENTS_BASE_HXX
diff --git a/odb/oracle/view-statements.hxx b/odb/oracle/view-statements.hxx
new file mode 100644
index 0000000..4dde079
--- /dev/null
+++ b/odb/oracle/view-statements.hxx
@@ -0,0 +1,109 @@
+// file      : odb/oracle/view-statements.hxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_ORACLE_VIEW_STATEMENTS_HXX
+#define ODB_ORACLE_VIEW_STATEMENTS_HXX
+
+#include <odb/pre.hxx>
+
+#include <cstddef> // std::size_t
+
+#include <odb/forward.hxx>
+#include <odb/traits.hxx>
+
+#include <odb/details/shared-ptr.hxx>
+
+#include <odb/oracle/oracle-types.hxx>
+#include <odb/oracle/version.hxx>
+#include <odb/oracle/statement.hxx>
+#include <odb/oracle/statements-base.hxx>
+
+namespace odb
+{
+  namespace oracle
+  {
+    template <typename T>
+    class view_statements: public statements_base
+    {
+    public:
+      typedef T view_type;
+      typedef odb::view_traits<view_type> view_traits;
+      typedef typename view_traits::pointer_type pointer_type;
+      typedef typename view_traits::image_type image_type;
+
+      typedef oracle::select_statement query_statement_type;
+
+    public:
+      view_statements (connection_type&);
+
+      virtual
+      ~view_statements ();
+
+      // View image.
+      //
+      image_type&
+      image ()
+      {
+        return image_;
+      }
+
+      std::size_t
+      image_version () const
+      {
+        return image_version_;
+      }
+
+      void
+      image_version (std::size_t v)
+      {
+        image_version_ = v;
+      }
+
+      binding&
+      image_binding ()
+      {
+        return image_binding_;
+      }
+
+      sb2*
+      image_indicator ()
+      {
+        return image_indicator_;
+      }
+
+      query_statement_type&
+      query_statement ()
+      {
+        if (query_ == 0)
+          query_.reset (
+            new (details::shared) query_statement_type (
+              conn_,
+              view_traits::query_statement,
+              image_binding_));
+
+        return *query_;
+      }
+
+    private:
+      view_statements (const view_statements&);
+      view_statements& operator= (const view_statements&);
+
+    private:
+      image_type image_;
+      std::size_t image_version_;
+      binding image_binding_;
+      bind image_bind_[view_traits::column_count];
+      sb2 image_indicator_[view_traits::column_count];
+
+      details::shared_ptr<query_statement_type> query_;
+    };
+  }
+}
+
+#include <odb/oracle/view-statements.txx>
+
+#include <odb/post.hxx>
+
+#endif // ODB_ORACLE_VIEW_STATEMENTS_HXX
diff --git a/odb/oracle/view-statements.txx b/odb/oracle/view-statements.txx
new file mode 100644
index 0000000..7f7b4c3
--- /dev/null
+++ b/odb/oracle/view-statements.txx
@@ -0,0 +1,35 @@
+// file      : odb/oracle/view-statements.txx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#include <cstddef> // std::size_t
+#include <cstring> // std::memset
+
+namespace odb
+{
+  namespace oracle
+  {
+    template <typename T>
+    view_statements<T>::
+    ~view_statements ()
+    {
+    }
+
+    template <typename T>
+    view_statements<T>::
+    view_statements (connection_type& conn)
+        : statements_base (conn),
+          image_binding_ (image_bind_, view_traits::column_count)
+    {
+      image_.version = 0;
+      image_version_ = 0;
+
+      std::memset (image_bind_, 0, sizeof (image_bind_));
+      std::memset (image_indicator_, 0, sizeof (image_indicator_));
+
+      for (std::size_t i (0) i < view_traits::column_count; ++i)
+        image_bind_[i].indicator = image_indicator_ + i;
+    }
+  }
+}