aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-03-10 10:24:27 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-03-21 15:40:00 +0200
commita98ab50a31b57d609588ad13c39e8819c3cd0f9e (patch)
tree96a0cedc6c16c894d6c03f041cc9a65d68f863ba
parente681587b3cd9a96de3d58af48b15a799990f6e8d (diff)
Cosmetic changes (function renames)
-rw-r--r--odb/relational/mysql/common.cxx2
-rw-r--r--odb/relational/mysql/context.cxx16
-rw-r--r--odb/relational/mysql/context.hxx3
3 files changed, 12 insertions, 9 deletions
diff --git a/odb/relational/mysql/common.cxx b/odb/relational/mysql/common.cxx
index 7264e81..e59216e 100644
--- a/odb/relational/mysql/common.cxx
+++ b/odb/relational/mysql/common.cxx
@@ -55,7 +55,7 @@ namespace relational
}
else
{
- sql_type const& st (db_type (m, key_prefix_));
+ sql_type const& st (column_sql_type (m, key_prefix_));
if (semantics::class_* c = object_pointer (t))
{
diff --git a/odb/relational/mysql/context.cxx b/odb/relational/mysql/context.cxx
index 3fc09d2..545f889 100644
--- a/odb/relational/mysql/context.cxx
+++ b/odb/relational/mysql/context.cxx
@@ -108,8 +108,8 @@ namespace relational
if (!(c.count ("object") || context::comp_value (c)))
return;
- if (c.count ("mysql::grow"))
- r_ = c.get<bool> ("mysql::grow");
+ if (c.count ("mysql-grow"))
+ r_ = c.get<bool> ("mysql-grow");
else
{
// r_ should be false.
@@ -119,7 +119,7 @@ namespace relational
if (!r_)
names (c);
- c.set ("mysql::grow", r_);
+ c.set ("mysql-grow", r_);
}
}
@@ -184,8 +184,8 @@ namespace relational
bool context::
grow_impl (semantics::class_& c)
{
- if (c.count ("mysql::grow"))
- return c.get<bool> ("mysql::grow");
+ if (c.count ("mysql-grow"))
+ return c.get<bool> ("mysql-grow");
bool r (false);
has_grow ct (r);
@@ -236,9 +236,11 @@ namespace relational
parse_sql_type (semantics::data_member& m, std::string const& sql);
sql_type const& context::
- db_type (semantics::data_member& m, string const& kp)
+ column_sql_type (semantics::data_member& m, string const& kp)
{
- string key (kp.empty () ? string ("db-type") : kp + "-db-type");
+ string key (kp.empty ()
+ ? string ("mysql-column-sql-type")
+ : "mysql-" + kp + "-column-sql-type");
if (!m.count (key))
m.set (key, parse_sql_type (m, column_type (m, kp)));
diff --git a/odb/relational/mysql/context.hxx b/odb/relational/mysql/context.hxx
index 4141a4a..a54803d 100644
--- a/odb/relational/mysql/context.hxx
+++ b/odb/relational/mysql/context.hxx
@@ -78,7 +78,8 @@ namespace relational
{
public:
sql_type const&
- db_type (semantics::data_member&, string const& key_prefix = string ());
+ column_sql_type (semantics::data_member&,
+ string const& key_prefix = string ());
protected:
virtual bool