Cosmetic changes

5 files changed, 53 insertions, 53 deletions

diff --git a/odb/relational/common.cxx b/odb/relational/common.cxx
index 0bcc676..46e1570 100644
--- a/odb/relational/common.cxx
+++ b/odb/relational/common.cxx
@@ -104,13 +104,13 @@ namespace relational
     else
     {
       string im_type (image_type (m));
-      string db_type (database_type (m));
+      string db_type_id (database_type_id (m));
 
       string type (
         "mysql::value_traits< "
         + m.type ().fq_name (m.belongs ().hint ()) + ", "
         + im_type + ", "
-        + db_type
+        + db_type_id
         + " >::query_type");
 
       if (decl_)
@@ -119,7 +119,7 @@ namespace relational
            << "//" << endl
            << "static const mysql::query_column<" << endl
            << "  " << type << "," << endl
-           << "  " << db_type << ">" << endl
+           << "  " << db_type_id << ">" << endl
            << name << ";"
            << endl;
       }
@@ -129,7 +129,7 @@ namespace relational
 
         os << "const mysql::query_column<" << endl
            << "  " << type << "," << endl
-           << "  " << db_type << ">" << endl
+           << "  " << db_type_id << ">" << endl
            << scope_ << "::" << name << " (" << endl
            << column << ");"
            << endl;
diff --git a/odb/relational/common.hxx b/odb/relational/common.hxx
index 513d9d6..be9305f 100644
--- a/odb/relational/common.hxx
+++ b/odb/relational/common.hxx
@@ -68,7 +68,7 @@ namespace relational
     }
 
     virtual string
-    database_type (semantics::data_member&)
+    database_type_id (semantics::data_member&)
     {
       assert (false);
     }
diff --git a/odb/relational/mysql/common.cxx b/odb/relational/mysql/common.cxx
index d45229a..7264e81 100644
--- a/odb/relational/mysql/common.cxx
+++ b/odb/relational/mysql/common.cxx
@@ -344,79 +344,79 @@ namespace relational
       };
     }
 
-    member_database_type::
-    member_database_type (semantics::type* type,
+    member_database_type_id::
+    member_database_type_id (semantics::type* type,
                           string const& fq_type,
                           string const& key_prefix)
         : relational::member_base (type, fq_type, key_prefix)
     {
     }
 
-    string member_database_type::
-    database_type (type& m)
+    string member_database_type_id::
+    database_type_id (type& m)
     {
-      type_.clear ();
+      type_id_.clear ();
       member_base::traverse (m);
-      return type_;
+      return type_id_;
     }
 
-    void member_database_type::
+    void member_database_type_id::
     traverse_composite (member_info&)
     {
       assert (false);
     }
 
-    void member_database_type::
+    void member_database_type_id::
     traverse_integer (member_info& mi)
     {
       size_t i (
         (mi.st->type - sql_type::TINYINT) * 2 + (mi.st->unsign ? 1 : 0));
-      type_ = string ("mysql::") + integer_database_id[i];
+      type_id_ = string ("mysql::") + integer_database_id[i];
     }
 
-    void member_database_type::
+    void member_database_type_id::
     traverse_float (member_info& mi)
     {
-      type_ = string ("mysql::") +
+      type_id_ = string ("mysql::") +
         float_database_id[mi.st->type - sql_type::FLOAT];
     }
 
-    void member_database_type::
+    void member_database_type_id::
     traverse_decimal (member_info&)
     {
-      type_ = "mysql::id_decimal";
+      type_id_ = "mysql::id_decimal";
     }
 
-    void member_database_type::
+    void member_database_type_id::
     traverse_date_time (member_info& mi)
     {
-      type_ = string ("mysql::") +
+      type_id_ = string ("mysql::") +
         date_time_database_id[mi.st->type - sql_type::DATE];
     }
 
-    void member_database_type::
+    void member_database_type_id::
     traverse_string (member_info& mi)
     {
-      type_ = string ("mysql::") +
+      type_id_ = string ("mysql::") +
         char_bin_database_id[mi.st->type - sql_type::CHAR];
     }
 
-    void member_database_type::
+    void member_database_type_id::
     traverse_bit (member_info&)
     {
-      type_ = "mysql::id_bit";
+      type_id_ = "mysql::id_bit";
     }
 
-    void member_database_type::
+    void member_database_type_id::
     traverse_enum (member_info&)
     {
-      type_ = "mysql::id_enum";
+      type_id_ = "mysql::id_enum";
     }
 
-    void member_database_type::
+    void member_database_type_id::
     traverse_set (member_info&)
     {
-      type_ = "mysql::id_set";
+      type_id_ = "mysql::id_set";
     }
 
     //
@@ -434,14 +434,14 @@ namespace relational
       }
 
       virtual string
-      database_type (semantics::data_member& m)
+      database_type_id (semantics::data_member& m)
       {
-        return member_database_type_.database_type (m);
+        return member_database_type_id_.database_type_id (m);
       }
 
     private:
       member_image_type member_image_type_;
-      member_database_type member_database_type_;
+      member_database_type_id member_database_type_id_;
     };
     entry<query_columns> query_columns_;
   }
diff --git a/odb/relational/mysql/common.hxx b/odb/relational/mysql/common.hxx
index e58390f..dae7774 100644
--- a/odb/relational/mysql/common.hxx
+++ b/odb/relational/mysql/common.hxx
@@ -183,13 +183,13 @@ namespace relational
       string type_;
     };
 
-    struct member_database_type: member_base
+    struct member_database_type_id: member_base
     {
-      member_database_type (semantics::type* type = 0,
-                            string const& fq_type = string (),
-                            string const& key_prefix = string ());
+      member_database_type_id (semantics::type* type = 0,
+                               string const& fq_type = string (),
+                               string const& key_prefix = string ());
       string
-      database_type (type&);
+      database_type_id (type&);
 
       virtual void
       traverse_composite (member_info&);
@@ -219,7 +219,7 @@ namespace relational
       traverse_set (member_info&);
 
     private:
-      string type_;
+      string type_id_;
     };
   }
 }
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_;
     }