diff options
author | Constantin Michael <constantin@codesynthesis.com> | 2011-10-20 20:40:18 +0200 |
---|---|---|
committer | Constantin Michael <constantin@codesynthesis.com> | 2011-10-21 11:47:15 +0200 |
commit | 8a1fc3adebbc0fe22edc8bb123327d6684e750ab (patch) | |
tree | 9688e0630f313ed8e0591530bf6bfbe337b94de2 | |
parent | 0af59b8a8cf626e71da89a2b301c203bc1a23d97 (diff) |
Rename relational::context::use_as to relational::context::need_alias_as
-rw-r--r-- | odb/relational/context.cxx | 4 | ||||
-rw-r--r-- | odb/relational/context.hxx | 4 | ||||
-rw-r--r-- | odb/relational/mysql/context.cxx | 2 | ||||
-rw-r--r-- | odb/relational/oracle/context.cxx | 2 | ||||
-rw-r--r-- | odb/relational/pgsql/context.cxx | 2 | ||||
-rw-r--r-- | odb/relational/source.hxx | 12 | ||||
-rw-r--r-- | odb/relational/sqlite/context.cxx | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/odb/relational/context.cxx b/odb/relational/context.cxx index 5965b2b..363b3bf 100644 --- a/odb/relational/context.cxx +++ b/odb/relational/context.cxx @@ -24,7 +24,7 @@ namespace relational context () : data_ (current ().data_), generate_grow (data_->generate_grow_), - use_as (data_->use_as_), + need_alias_as (data_->need_alias_as_), bind_vector (data_->bind_vector_), truncated_vector (data_->truncated_vector_) { @@ -34,7 +34,7 @@ namespace relational context (data* d) : data_ (d), generate_grow (data_->generate_grow_), - use_as (data_->use_as_), + need_alias_as (data_->need_alias_as_), bind_vector (data_->bind_vector_), truncated_vector (data_->truncated_vector_) { diff --git a/odb/relational/context.hxx b/odb/relational/context.hxx index 3658f29..7bff5b1 100644 --- a/odb/relational/context.hxx +++ b/odb/relational/context.hxx @@ -132,7 +132,7 @@ namespace relational data (std::ostream& os): root_context::data (os) {} bool generate_grow_; - bool use_as_; + bool need_alias_as_; string bind_vector_; string truncated_vector_; @@ -141,7 +141,7 @@ namespace relational public: bool generate_grow; - bool use_as; + bool need_alias_as; string const& bind_vector; string const& truncated_vector; diff --git a/odb/relational/mysql/context.cxx b/odb/relational/mysql/context.cxx index 5005923..08f2df5 100644 --- a/odb/relational/mysql/context.cxx +++ b/odb/relational/mysql/context.cxx @@ -76,7 +76,7 @@ namespace relational current_ = this; data_->generate_grow_ = true; - data_->use_as_ = true; + data_->need_alias_as_ = true; data_->bind_vector_ = "MYSQL_BIND*"; data_->truncated_vector_ = "my_bool*"; diff --git a/odb/relational/oracle/context.cxx b/odb/relational/oracle/context.cxx index e74edc6..0128c94 100644 --- a/odb/relational/oracle/context.cxx +++ b/odb/relational/oracle/context.cxx @@ -76,7 +76,7 @@ namespace relational current_ = this; data_->generate_grow_ = false; - data_->use_as_ = false; + data_->need_alias_as_ = false; data_->bind_vector_ = "oracle::bind*"; // Populate the C++ type to DB type map. diff --git a/odb/relational/pgsql/context.cxx b/odb/relational/pgsql/context.cxx index b625501..28a6cbd 100644 --- a/odb/relational/pgsql/context.cxx +++ b/odb/relational/pgsql/context.cxx @@ -76,7 +76,7 @@ namespace relational current_ = this; data_->generate_grow_ = true; - data_->use_as_ = true; + data_->need_alias_as_ = true; data_->bind_vector_ = "pgsql::bind*"; data_->truncated_vector_ = "bool*"; diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx index 60778fa..7a3a695 100644 --- a/odb/relational/source.hxx +++ b/odb/relational/source.hxx @@ -385,7 +385,7 @@ namespace relational line += i->table; if (!i->alias.empty ()) - line += (use_as ? " AS " : " ") + i->alias; + line += (need_alias_as ? " AS " : " ") + i->alias; line += " ON "; line += i->cond; @@ -3201,7 +3201,7 @@ namespace relational l += quote_id (i->orig_name); if (!i->alias.empty ()) - l += (use_as ? " AS " : " ") + quote_id (i->alias); + l += (need_alias_as ? " AS " : " ") + quote_id (i->alias); os << "r += " << strlit (l) << ";" << endl; @@ -3213,7 +3213,7 @@ namespace relational l += quote_id (i->orig_name); if (!i->alias.empty ()) - l += (use_as ? " AS " : " ") + quote_id (i->alias); + l += (need_alias_as ? " AS " : " ") + quote_id (i->alias); expression e ( translate_expression ( @@ -3254,7 +3254,7 @@ namespace relational l += table_qname (*i->obj); if (!i->alias.empty ()) - l += (use_as ? " AS " : " ") + quote_id (i->alias); + l += (need_alias_as ? " AS " : " ") + quote_id (i->alias); os << "r += " << strlit (l) << ";" << endl; @@ -3274,7 +3274,7 @@ namespace relational l += table_qname (*i->obj); if (!i->alias.empty ()) - l += (use_as ? " AS " : " ") + quote_id (i->alias); + l += (need_alias_as ? " AS " : " ") + quote_id (i->alias); l += " ON"; @@ -3488,7 +3488,7 @@ namespace relational l += table_qname (*i->obj); if (!i->alias.empty ()) - l += (use_as ? " AS " : " ") + quote_id (i->alias); + l += (need_alias_as ? " AS " : " ") + quote_id (i->alias); l += " ON"; os << "r += " << strlit (l) << ";"; diff --git a/odb/relational/sqlite/context.cxx b/odb/relational/sqlite/context.cxx index 3f8f2ee..466c5b9 100644 --- a/odb/relational/sqlite/context.cxx +++ b/odb/relational/sqlite/context.cxx @@ -74,7 +74,7 @@ namespace relational current_ = this; data_->generate_grow_ = true; - data_->use_as_ = true; + data_->need_alias_as_ = true; data_->bind_vector_ = "sqlite::bind*"; data_->truncated_vector_ = "bool*"; |