From 8f78f966195268149ed1354dacf2b276792f5f7e Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 18 Apr 2011 18:27:15 +0200
Subject: Get rid of image type argument in value_traits

---
 odb/relational/mysql/common.cxx |  7 -------
 odb/relational/mysql/source.cxx | 16 ----------------
 2 files changed, 23 deletions(-)

(limited to 'odb/relational/mysql')

diff --git a/odb/relational/mysql/common.cxx b/odb/relational/mysql/common.cxx
index e59216e..82acc42 100644
--- a/odb/relational/mysql/common.cxx
+++ b/odb/relational/mysql/common.cxx
@@ -428,19 +428,12 @@ namespace relational
       query_columns (base const& x): base (x) {}
 
       virtual string
-      image_type (semantics::data_member& m)
-      {
-        return member_image_type_.image_type (m);
-      }
-
-      virtual string
       database_type_id (semantics::data_member& m)
       {
         return member_database_type_id_.database_type_id (m);
       }
 
     private:
-      member_image_type member_image_type_;
       member_database_type_id member_database_type_id_;
     };
     entry<query_columns> query_columns_;
diff --git a/odb/relational/mysql/source.cxx b/odb/relational/mysql/source.cxx
index cf26082..41e4913 100644
--- a/odb/relational/mysql/source.cxx
+++ b/odb/relational/mysql/source.cxx
@@ -396,9 +396,6 @@ namespace relational
             : member_base::base (x), // virtual base
               base (x),
               member_base (x),
-              member_image_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_)
@@ -437,7 +434,6 @@ namespace relational
             if (semantics::class_* c = object_pointer (mt))
             {
               type = "obj_traits::id_type";
-              image_type = member_image_type_.image_type (mi.m);
               db_type_id = member_database_type_id_.database_type_id (mi.m);
 
               // Handle NULL pointers and extract the id.
@@ -482,7 +478,6 @@ namespace relational
             else
             {
               type = mi.fq_type ();
-              image_type = member_image_type_.image_type (mi.m);
               db_type_id = member_database_type_id_.database_type_id (mi.m);
 
               os << "{"
@@ -491,7 +486,6 @@ namespace relational
 
             traits = "mysql::value_traits<\n    "
               + type + ",\n    "
-              + image_type + ",\n    "
               + db_type_id + " >";
           }
 
@@ -648,10 +642,8 @@ namespace relational
         string type;
         string db_type_id;
         string member;
-        string image_type;
         string traits;
 
-        member_image_type member_image_type_;
         member_database_type_id member_database_type_id_;
       };
       entry<init_image_member> init_image_member_;
@@ -666,9 +658,6 @@ namespace relational
             : member_base::base (x), // virtual base
               base (x),
               member_base (x),
-              member_image_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_)
@@ -704,7 +693,6 @@ namespace relational
             if (semantics::class_* c = object_pointer (mt))
             {
               type = "obj_traits::id_type";
-              image_type = member_image_type_.image_type (mi.m);
               db_type_id = member_database_type_id_.database_type_id (mi.m);
 
               // Handle NULL pointers and extract the id.
@@ -731,13 +719,11 @@ namespace relational
             else
             {
               type = mi.fq_type ();
-              image_type = member_image_type_.image_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_id + " >";
           }
 
@@ -886,11 +872,9 @@ namespace relational
       private:
         string type;
         string db_type_id;
-        string image_type;
         string traits;
         string member;
 
-        member_image_type member_image_type_;
         member_database_type_id member_database_type_id_;
       };
       entry<init_value_member> init_value_member_;
-- 
cgit v1.1