diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2015-08-24 17:51:48 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-08-24 17:51:48 +0200 |
| commit | de130e93d8b2c026732211e67b6f31157f1b7e87 (patch) | |
| tree | 898f6bf3f0029565654b044df057789097c86ab0 /odb/relational | |
| parent | 15995637f9cab6a4d92a2383e2afdba2b48d5f7b (diff) | |
Fix inconsistent composite value member prefix derivation
Diffstat (limited to 'odb/relational')
| -rw-r--r-- | odb/relational/common-query.cxx | 2 | ||||
| -rw-r--r-- | odb/relational/model.hxx | 2 | ||||
| -rw-r--r-- | odb/relational/source.hxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/odb/relational/common-query.cxx b/odb/relational/common-query.cxx index 2620e3a..0fd4c58 100644 --- a/odb/relational/common-query.cxx +++ b/odb/relational/common-query.cxx @@ -47,7 +47,7 @@ namespace relational n = column_name (m, key_prefix_, default_name_, dummy); } - alias = compose_name (column_prefix_.prefix, n); + alias = column_prefix_.prefix + n; } generate_def (public_name (m), c, alias); diff --git a/odb/relational/model.hxx b/odb/relational/model.hxx index 3b53c67..b776d76 100644 --- a/odb/relational/model.hxx +++ b/odb/relational/model.hxx @@ -390,7 +390,7 @@ namespace relational else if (p[p.size () - 1] == '_') p.resize (p.size () - 1); // Remove trailing underscore. - name = compose_name (column_prefix_.prefix, p); + name = column_prefix_.prefix + p; } model_.new_edge<sema_rel::unames> ( diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx index 9b23b31..dd6054a 100644 --- a/odb/relational/source.hxx +++ b/odb/relational/source.hxx @@ -294,7 +294,7 @@ namespace relational n = column_name (m, key_prefix_, default_name_, dummy); } - alias = compose_name (column_prefix_.prefix, n); + alias = column_prefix_.prefix + n; if (poly) { @@ -981,7 +981,7 @@ namespace relational n = column_name (m, key_prefix_, default_name_, dummy); } - alias = compose_name (column_prefix_.prefix, n); + alias = column_prefix_.prefix + n; } semantics::class_* poly_root (polymorphic (c)); |