Add a context flag indicating whether AS SQL keyword should be used for aliases

6 files changed, 10 insertions, 0 deletions

diff --git a/odb/relational/context.cxx b/odb/relational/context.cxx
index 5dd94a3..5965b2b 100644
--- a/odb/relational/context.cxx
+++ b/odb/relational/context.cxx
@@ -24,6 +24,7 @@ namespace relational
   context ()
       : data_ (current ().data_),
         generate_grow (data_->generate_grow_),
+        use_as (data_->use_as_),
         bind_vector (data_->bind_vector_),
         truncated_vector (data_->truncated_vector_)
   {
@@ -33,6 +34,7 @@ namespace relational
   context (data* d)
       : data_ (d),
         generate_grow (data_->generate_grow_),
+        use_as (data_->use_as_),
         bind_vector (data_->bind_vector_),
         truncated_vector (data_->truncated_vector_)
   {
diff --git a/odb/relational/context.hxx b/odb/relational/context.hxx
index ba633d7..3658f29 100644
--- a/odb/relational/context.hxx
+++ b/odb/relational/context.hxx
@@ -132,6 +132,8 @@ namespace relational
       data (std::ostream& os): root_context::data (os) {}
 
       bool generate_grow_;
+      bool use_as_;
+
       string bind_vector_;
       string truncated_vector_;
     };
@@ -139,6 +141,8 @@ namespace relational
 
   public:
     bool generate_grow;
+    bool use_as;
+
     string const& bind_vector;
     string const& truncated_vector;
   };
diff --git a/odb/relational/mysql/context.cxx b/odb/relational/mysql/context.cxx
index f8d92b0..5005923 100644
--- a/odb/relational/mysql/context.cxx
+++ b/odb/relational/mysql/context.cxx
@@ -76,6 +76,7 @@ namespace relational
       current_ = this;
 
       data_->generate_grow_ = true;
+      data_->use_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 c521114..e74edc6 100644
--- a/odb/relational/oracle/context.cxx
+++ b/odb/relational/oracle/context.cxx
@@ -76,6 +76,7 @@ namespace relational
       current_ = this;
 
       data_->generate_grow_ = false;
+      data_->use_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 148744d..b625501 100644
--- a/odb/relational/pgsql/context.cxx
+++ b/odb/relational/pgsql/context.cxx
@@ -76,6 +76,7 @@ namespace relational
       current_ = this;
 
       data_->generate_grow_ = true;
+      data_->use_as_ = true;
       data_->bind_vector_ = "pgsql::bind*";
       data_->truncated_vector_ = "bool*";
 
diff --git a/odb/relational/sqlite/context.cxx b/odb/relational/sqlite/context.cxx
index a7c9ea9..3f8f2ee 100644
--- a/odb/relational/sqlite/context.cxx
+++ b/odb/relational/sqlite/context.cxx
@@ -74,6 +74,7 @@ namespace relational
       current_ = this;
 
       data_->generate_grow_ = true;
+      data_->use_as_ = true;
       data_->bind_vector_ = "sqlite::bind*";
       data_->truncated_vector_ = "bool*";