From 4a5d10cab97ffc30e6617fb72cd88f2348cdaf26 Mon Sep 17 00:00:00 2001
From: Constantin Michael <constantin@codesynthesis.com>
Date: Tue, 5 Jul 2011 12:57:47 +0200
Subject: Correct container statement name logic to avoid inherited name
 conflicts

---
 odb/relational/pgsql/source.cxx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/odb/relational/pgsql/source.cxx b/odb/relational/pgsql/source.cxx
index b1fe16d..5807625 100644
--- a/odb/relational/pgsql/source.cxx
+++ b/odb/relational/pgsql/source.cxx
@@ -971,7 +971,11 @@ namespace relational
           // Statment names.
           //
           string stmt_decl ("const char* const " + scope + "::");
-          string stmt_prefix (flat_name (m.fq_name ()));
+
+          // Prefix top-object name to avoid conflicts with inherited
+          // member statement names.
+          //
+          string stmt_prefix (top_object->fq_name () +  m.fq_name ());
 
           os << stmt_decl << endl
              << "insert_one_name = " <<
-- 
cgit v1.1