diff options
Diffstat (limited to 'odb/relational/mysql/source.cxx')
-rw-r--r-- | odb/relational/mysql/source.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/odb/relational/mysql/source.cxx b/odb/relational/mysql/source.cxx index 71f556a..f435014 100644 --- a/odb/relational/mysql/source.cxx +++ b/odb/relational/mysql/source.cxx @@ -399,9 +399,9 @@ namespace relational member_image_type_ (base::type_override_, base::fq_type_override_, base::key_prefix_), - member_database_type_ (base::type_override_, - base::fq_type_override_, - base::key_prefix_) + member_database_type_id_ (base::type_override_, + base::fq_type_override_, + base::key_prefix_) { } @@ -438,7 +438,7 @@ namespace relational { type = "obj_traits::id_type"; image_type = member_image_type_.image_type (mi.m); - db_type = member_database_type_.database_type (mi.m); + db_type_id = member_database_type_id_.database_type_id (mi.m); // Handle NULL pointers and extract the id. // @@ -483,7 +483,7 @@ namespace relational { type = mi.fq_type (); image_type = member_image_type_.image_type (mi.m); - db_type = member_database_type_.database_type (mi.m); + db_type_id = member_database_type_id_.database_type_id (mi.m); os << "{" << "bool is_null;"; @@ -492,7 +492,7 @@ namespace relational traits = "mysql::value_traits<\n " + type + ",\n " + image_type + ",\n " - + db_type + " >"; + + db_type_id + " >"; } return true; @@ -646,13 +646,13 @@ namespace relational private: string type; - string db_type; + string db_type_id; string member; string image_type; string traits; member_image_type member_image_type_; - member_database_type member_database_type_; + member_database_type_id member_database_type_id_; }; entry<init_image_member> init_image_member_; @@ -669,9 +669,9 @@ namespace relational member_image_type_ (base::type_override_, base::fq_type_override_, base::key_prefix_), - member_database_type_ (base::type_override_, - base::fq_type_override_, - base::key_prefix_) + member_database_type_id_ (base::type_override_, + base::fq_type_override_, + base::key_prefix_) { } @@ -705,7 +705,7 @@ namespace relational { type = "obj_traits::id_type"; image_type = member_image_type_.image_type (mi.m); - db_type = member_database_type_.database_type (mi.m); + db_type_id = member_database_type_id_.database_type_id (mi.m); // Handle NULL pointers and extract the id. // @@ -732,13 +732,13 @@ namespace relational { type = mi.fq_type (); image_type = member_image_type_.image_type (mi.m); - db_type = member_database_type_.database_type (mi.m); + db_type_id = member_database_type_id_.database_type_id (mi.m); } traits = "mysql::value_traits<\n " + type + ",\n " + image_type + ",\n " - + db_type + " >"; + + db_type_id + " >"; } return true; @@ -885,13 +885,13 @@ namespace relational private: string type; - string db_type; + string db_type_id; string image_type; string traits; string member; member_image_type member_image_type_; - member_database_type member_database_type_; + member_database_type_id member_database_type_id_; }; entry<init_value_member> init_value_member_; } |