From 137abdfb24c98375a61ed9ac08f3d37e9e07fee5 Mon Sep 17 00:00:00 2001 From: Constantin Michael Date: Wed, 29 Jun 2011 08:22:07 +0200 Subject: Use container traits column counts to specifiy container statment counts --- odb/pgsql/container-statements.hxx | 4 ++-- odb/pgsql/container-statements.txx | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'odb') diff --git a/odb/pgsql/container-statements.hxx b/odb/pgsql/container-statements.hxx index c33ae8a..a1a0e66 100644 --- a/odb/pgsql/container-statements.hxx +++ b/odb/pgsql/container-statements.hxx @@ -294,12 +294,12 @@ namespace odb private: bind cond_image_bind_array_[traits::cond_column_count]; - const char* cond_image_values_[traits::cond_column_count]; + char* cond_image_values_[traits::cond_column_count]; int cond_image_lengths_[traits::cond_column_count]; int cond_image_formats_[traits::cond_column_count]; bind data_image_bind_array_[traits::data_column_count]; - const char* data_image_values_[traits::data_column_count]; + char* data_image_values_[traits::data_column_count]; int data_image_lengths_[traits::data_column_count]; int data_image_formats_[traits::data_column_count]; diff --git a/odb/pgsql/container-statements.txx b/odb/pgsql/container-statements.txx index 806abbe..72ce213 100644 --- a/odb/pgsql/container-statements.txx +++ b/odb/pgsql/container-statements.txx @@ -70,20 +70,20 @@ namespace odb for (std::size_t i (0); i < traits::data_column_count; ++i) data_image_bind_array_[i].truncated = data_image_truncated_array_ + i; - this->insert_one_name = traits::insert_one_name; + this->insert_one_name_ = traits::insert_one_name; this->insert_one_text_ = traits::insert_one_statement; this->insert_one_types_ = traits::insert_one_types; - this->insert_one_count_ = traits::insert_one_count; + this->insert_one_count_ = traits::data_column_count; - this->select_all_name = traits::select_all_name; + this->select_all_name_ = traits::select_all_name; this->select_all_text_ = traits::select_all_statement; this->select_all_types_ = traits::select_all_types; - this->select_all_count_ = traits::select_all_count; + this->select_all_count_ = traits::cond_column_count; this->delete_all_name_ = traits::delete_all_name; this->delete_all_text_ = traits::delete_all_statement; this->delete_all_types_ = traits::delete_all_types; - this->delete_all_count_ = traits::delete_all_count; + this->delete_all_count_ = traits::cond_column_count; } } } -- cgit v1.1