aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstantin Michael <constantin@codesynthesis.com>2011-07-05 12:57:47 +0200
committerConstantin Michael <constantin@codesynthesis.com>2011-07-05 14:43:38 +0200
commit4a5d10cab97ffc30e6617fb72cd88f2348cdaf26 (patch)
tree6d59906a57c6c012e2a4bff3b590215b5a2991a2
parentc8d66805dbd6cf6b2c780675318b7324799ea657 (diff)
Correct container statement name logic to avoid inherited name conflicts
-rw-r--r--odb/relational/pgsql/source.cxx6
1 files changed, 5 insertions, 1 deletions
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 = " <<