From 1e341e5902b18fcf076a04eb4be164748d8761d8 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 18 Jun 2012 09:32:10 +0200
Subject: Allocate container traits lazily and only when their definition is
 seen

This fixes a problem with polymorphic hierarchies spread over multiple
files in which case the source code for the derived class does not have
the definition of the container traits for the base class. See the comment
in the source code for further details.
---
 odb/oracle/polymorphic-object-statements.hxx |  5 ++-
 odb/oracle/polymorphic-object-statements.txx |  1 -
 odb/oracle/simple-object-statements.hxx      | 57 +++++++++++++++++++++++++++-
 odb/oracle/simple-object-statements.txx      |  1 -
 4 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/odb/oracle/polymorphic-object-statements.hxx b/odb/oracle/polymorphic-object-statements.hxx
index 0b8ddcb..dce30c3 100644
--- a/odb/oracle/polymorphic-object-statements.hxx
+++ b/odb/oracle/polymorphic-object-statements.hxx
@@ -338,7 +338,7 @@ namespace odb
       container_statement_cache_type&
       container_statment_cache ()
       {
-        return container_statement_cache_;
+        return container_statement_cache_.get (conn_);
       }
 
     public:
@@ -370,7 +370,8 @@ namespace odb
       root_statements_type& root_statements_;
       base_statements_type& base_statements_;
 
-      container_statement_cache_type container_statement_cache_;
+      container_statement_cache_ptr<container_statement_cache_type>
+      container_statement_cache_;
 
       image_type image_;
 
diff --git a/odb/oracle/polymorphic-object-statements.txx b/odb/oracle/polymorphic-object-statements.txx
index e997662..4e0a863 100644
--- a/odb/oracle/polymorphic-object-statements.txx
+++ b/odb/oracle/polymorphic-object-statements.txx
@@ -63,7 +63,6 @@ namespace odb
         : statements_base (conn),
           root_statements_ (conn.statement_cache ().find_object<root_type> ()),
           base_statements_ (conn.statement_cache ().find_object<base_type> ()),
-          container_statement_cache_ (conn),
           insert_image_binding_ (insert_image_bind_, insert_column_count),
           update_image_binding_ (update_image_bind_,
                                  update_column_count + id_column_count)
diff --git a/odb/oracle/simple-object-statements.hxx b/odb/oracle/simple-object-statements.hxx
index 101c96f..20cfffe 100644
--- a/odb/oracle/simple-object-statements.hxx
+++ b/odb/oracle/simple-object-statements.hxx
@@ -29,6 +29,58 @@ namespace odb
 {
   namespace oracle
   {
+    // The container_statement_cache class is only defined (and used) in
+    // the generated source file. However, object_statements may be
+    // referenced from another source file in the case of a polymorphic
+    // hierarchy (though in this case the container statement cache is
+    // not used). As a result, we cannot have a by-value member and
+    // instead will store a pointer and lazily allocate the cache if
+    // and when needed. We will also need to store a pointer to the
+    // deleter function which will be initialized during allocation
+    // (at that point we know that the cache class is defined).
+    //
+    template <typename T>
+    struct container_statement_cache_ptr
+    {
+      typedef oracle::connection connection_type;
+
+      container_statement_cache_ptr (): p_ (0) {}
+      ~container_statement_cache_ptr () {if (p_ != 0) (this->*deleter_) (0);}
+
+      T&
+      get (connection_type& c)
+      {
+        if (p_ == 0)
+          allocate (&c);
+
+        return *p_;
+      }
+
+    private:
+      void
+      allocate (connection_type*);
+
+    private:
+      T* p_;
+      void (container_statement_cache_ptr::*deleter_) (connection_type*);
+    };
+
+    template <typename T>
+    void container_statement_cache_ptr<T>::
+    allocate (connection_type* c)
+    {
+      // To reduce object code size, this function acts as both allocator
+      // and deleter.
+      //
+      if (p_ == 0)
+      {
+        p_ = new T (*c);
+        deleter_ = &container_statement_cache_ptr<T>::allocate;
+      }
+      else
+        delete p_;
+    }
+
     //
     // Implementation for objects with object id.
     //
@@ -357,7 +409,7 @@ namespace odb
       container_statement_cache_type&
       container_statment_cache ()
       {
-        return container_statement_cache_;
+        return container_statement_cache_.get (conn_);
       }
 
     public:
@@ -393,7 +445,8 @@ namespace odb
       clear_delayed_ ();
 
     private:
-      container_statement_cache_type container_statement_cache_;
+      container_statement_cache_ptr<container_statement_cache_type>
+      container_statement_cache_;
 
       image_type image_;
 
diff --git a/odb/oracle/simple-object-statements.txx b/odb/oracle/simple-object-statements.txx
index a5f30e4..15c44fd 100644
--- a/odb/oracle/simple-object-statements.txx
+++ b/odb/oracle/simple-object-statements.txx
@@ -42,7 +42,6 @@ namespace odb
     object_statements<T>::
     object_statements (connection_type& conn)
         : object_statements_base (conn),
-          container_statement_cache_ (conn),
           select_image_binding_ (select_image_bind_, select_column_count),
           insert_image_binding_ (insert_image_bind_, insert_column_count),
           update_image_binding_ (update_image_bind_,
-- 
cgit v1.1