From 4869758e35a6820f2c05cb2c8ff7925808899e9c Mon Sep 17 00:00:00 2001 From: rbock Date: Sun, 26 Jan 2014 22:39:44 +0100 Subject: [PATCH] Renamed query -> statement --- include/sqlpp11/prepared_insert.h | 6 +++--- include/sqlpp11/prepared_remove.h | 6 +++--- include/sqlpp11/prepared_select.h | 6 +++--- include/sqlpp11/prepared_update.h | 6 +++--- include/sqlpp11/vendor/interpretable.h | 2 +- include/sqlpp11/vendor/named_interpretable.h | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/sqlpp11/prepared_insert.h b/include/sqlpp11/prepared_insert.h index 3895084e..1555984f 100644 --- a/include/sqlpp11/prepared_insert.h +++ b/include/sqlpp11/prepared_insert.h @@ -36,7 +36,7 @@ namespace sqlpp struct prepared_insert_t { using _parameter_list_t = typename Insert::_parameter_list_t; - using _prepared_query_t = typename Db::_prepared_query_t; + using _prepared_statement_t = typename Db::_prepared_statement_t; auto run(Db& db) const -> size_t @@ -46,11 +46,11 @@ namespace sqlpp void _bind_params() const { - params._bind(_prepared_query); + params._bind(_prepared_statement); } _parameter_list_t params; - mutable _prepared_query_t _prepared_query; + mutable _prepared_statement_t _prepared_statement; }; } diff --git a/include/sqlpp11/prepared_remove.h b/include/sqlpp11/prepared_remove.h index b8adcfbe..a88ab307 100644 --- a/include/sqlpp11/prepared_remove.h +++ b/include/sqlpp11/prepared_remove.h @@ -36,7 +36,7 @@ namespace sqlpp struct prepared_remove_t { using _parameter_list_t = typename Remove::_parameter_list_t; - using _prepared_query_t = typename Db::_prepared_query_t; + using _prepared_statement_t = typename Db::_prepared_statement_t; auto run(Db& db) const -> size_t @@ -46,11 +46,11 @@ namespace sqlpp void _bind_params() const { - params._bind(_prepared_query); + params._bind(_prepared_statement); } _parameter_list_t params; - mutable _prepared_query_t _prepared_query; + mutable _prepared_statement_t _prepared_statement; }; } diff --git a/include/sqlpp11/prepared_select.h b/include/sqlpp11/prepared_select.h index 4654cc4e..452de8ff 100644 --- a/include/sqlpp11/prepared_select.h +++ b/include/sqlpp11/prepared_select.h @@ -38,7 +38,7 @@ namespace sqlpp using _result_row_t = typename Select::_result_row_t; using _parameter_list_t = typename Select::_parameter_list_t; using _dynamic_names_t = typename Select::_dynamic_names_t; - using _prepared_query_t = typename Db::_prepared_query_t; + using _prepared_statement_t = typename Db::_prepared_statement_t; auto run(Db& db) const -> result_t @@ -48,12 +48,12 @@ namespace sqlpp void _bind_params() const { - params._bind(_prepared_query); + params._bind(_prepared_statement); } _parameter_list_t params; _dynamic_names_t _dynamic_names; - mutable _prepared_query_t _prepared_query; + mutable _prepared_statement_t _prepared_statement; }; } diff --git a/include/sqlpp11/prepared_update.h b/include/sqlpp11/prepared_update.h index 35d13d95..d165826b 100644 --- a/include/sqlpp11/prepared_update.h +++ b/include/sqlpp11/prepared_update.h @@ -36,7 +36,7 @@ namespace sqlpp struct prepared_update_t { using _parameter_list_t = typename Update::_parameter_list_t; - using _prepared_query_t = typename Db::_prepared_query_t; + using _prepared_statement_t = typename Db::_prepared_statement_t; auto run(Db& db) const -> size_t @@ -46,11 +46,11 @@ namespace sqlpp void _bind_params() const { - params._bind(_prepared_query); + params._bind(_prepared_statement); } _parameter_list_t params; - mutable _prepared_query_t _prepared_query; + mutable _prepared_statement_t _prepared_statement; }; } diff --git a/include/sqlpp11/vendor/interpretable.h b/include/sqlpp11/vendor/interpretable.h index 340b7caa..6dc6a21a 100644 --- a/include/sqlpp11/vendor/interpretable.h +++ b/include/sqlpp11/vendor/interpretable.h @@ -72,7 +72,7 @@ namespace sqlpp template struct _impl_t: public _impl_base { - static_assert(not make_parameter_list_t::type::size::value, "parameters not supported in dynamic query parts"); + static_assert(not make_parameter_list_t::type::size::value, "parameters not supported in dynamic statement parts"); _impl_t(const T& t): _t(t) {} diff --git a/include/sqlpp11/vendor/named_interpretable.h b/include/sqlpp11/vendor/named_interpretable.h index 2b535ce2..9764ed13 100644 --- a/include/sqlpp11/vendor/named_interpretable.h +++ b/include/sqlpp11/vendor/named_interpretable.h @@ -77,7 +77,7 @@ namespace sqlpp template struct _impl_t: public _impl_base { - static_assert(not make_parameter_list_t::type::size::value, "parameters not supported in dynamic query parts"); + static_assert(not make_parameter_list_t::type::size::value, "parameters not supported in dynamic statement parts"); _impl_t(const T& t): _t(t) {}