From 62886c67aa1088a5e26b885bb0f44c0e02e0975d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 1 Apr 2013 17:16:49 +0200
Subject: Handle inverse member in base class of polymorphic hierarchy

---
 odb/relational/source.cxx | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'odb/relational/source.cxx')

diff --git a/odb/relational/source.cxx b/odb/relational/source.cxx
index 22d2644..210d04b 100644
--- a/odb/relational/source.cxx
+++ b/odb/relational/source.cxx
@@ -581,10 +581,11 @@ traverse_object (type& c)
 
         os << strlit (" FROM " + qtable) << endl;
 
-        if (poly_derived)
+        if (d != 1)
         {
-          instance<polymorphic_object_joins> j (c, d);
-          j->traverse (c);
+          size_t d1 (d - 1); //@@ (im)perfect forward.
+          instance<polymorphic_object_joins> j (c, d1);
+          j->traverse (polymorphic_base (c));
         }
 
         bool f (false); // @@ (im)perfect forwarding
@@ -809,10 +810,11 @@ traverse_object (type& c)
 
     os << strlit (" FROM " + qtable) << endl;
 
-    if (poly_derived)
+    if (poly_depth != 1)
     {
-      instance<polymorphic_object_joins> j (c, poly_depth);
-      j->traverse (c);
+      size_t d (poly_depth - 1); //@@ (im)perfect forward.
+      instance<polymorphic_object_joins> j (c, d);
+      j->traverse (polymorphic_base (c));
     }
 
     if (id != 0)
@@ -3240,9 +3242,10 @@ traverse_view (type& c)
 
           if (poly_depth != 1)
           {
+            size_t d (poly_depth - 1); //@@ (im)perfect forward.
             instance<polymorphic_object_joins> j (
-              o, poly_depth, i->alias, "r += ", ";");
-            j->traverse (o);
+              o, d, i->alias, "r += ", ";");
+            j->traverse (polymorphic_base (o));
           }
 
           os << endl;
@@ -3277,9 +3280,10 @@ traverse_view (type& c)
 
           if (poly_depth != 1)
           {
+            size_t d (poly_depth - 1); //@@ (im)perfect forward.
             instance<polymorphic_object_joins> j (
-              o, poly_depth, i->alias, "r += ", ";");
-            j->traverse (o);
+              o, d, i->alias, "r += ", ";");
+            j->traverse (polymorphic_base (o));
           }
 
           os << endl;
@@ -3653,9 +3657,10 @@ traverse_view (type& c)
 
         if (poly_depth != 1)
         {
+          size_t d (poly_depth - 1); //@@ (im)perfect forward.
           instance<polymorphic_object_joins> j (
-            o, poly_depth, i->alias, "r += ", ";");
-          j->traverse (o);
+            o, d, i->alias, "r += ", ";");
+          j->traverse (polymorphic_base (o));
         }
 
         os << endl;
-- 
cgit v1.1