summaryrefslogtreecommitdiff
path: root/odb/relational/sqlite
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-04-18 18:27:15 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-04-19 08:39:02 +0200
commit8f78f966195268149ed1354dacf2b276792f5f7e (patch)
treea819dbadbdc30b71582f8b049fd1f65543f6dece /odb/relational/sqlite
parentbef1fce0e10b0b023dcf6e02214730754dc0fe17 (diff)
Get rid of image type argument in value_traits
Diffstat (limited to 'odb/relational/sqlite')
-rw-r--r--odb/relational/sqlite/common.cxx7
-rw-r--r--odb/relational/sqlite/source.cxx16
2 files changed, 0 insertions, 23 deletions
diff --git a/odb/relational/sqlite/common.cxx b/odb/relational/sqlite/common.cxx
index c8169a7..ef880ed 100644
--- a/odb/relational/sqlite/common.cxx
+++ b/odb/relational/sqlite/common.cxx
@@ -216,19 +216,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/sqlite/source.cxx b/odb/relational/sqlite/source.cxx
index b74f0cf..35a3246 100644
--- a/odb/relational/sqlite/source.cxx
+++ b/odb/relational/sqlite/source.cxx
@@ -213,9 +213,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_)
@@ -254,7 +251,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.
@@ -300,7 +296,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 << "{";
@@ -308,7 +303,6 @@ namespace relational
traits = "sqlite::value_traits<\n "
+ type + ",\n "
- + image_type + ",\n "
+ db_type_id + " >";
}
@@ -380,10 +374,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_;
@@ -398,9 +390,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_)
@@ -436,7 +425,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.
@@ -463,13 +451,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 = "sqlite::value_traits<\n "
+ type + ",\n "
- + image_type + ",\n "
+ db_type_id + " >";
}
@@ -550,11 +536,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_;