From 743d39c0c6b2eaee9b23f90568f2009b2e022005 Mon Sep 17 00:00:00 2001 From: Roland Bock Date: Sun, 29 Jan 2023 11:55:58 +0100 Subject: [PATCH] Rename requires_braces to requires_parens This fixes a typical German mistake :-) --- include/sqlpp11/interpretable.h | 6 +++--- include/sqlpp11/named_interpretable.h | 6 +++--- include/sqlpp11/select_pseudo_table.h | 2 +- include/sqlpp11/serialize.h | 2 +- include/sqlpp11/statement.h | 2 +- include/sqlpp11/table_alias.h | 4 ++-- include/sqlpp11/type_traits.h | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/sqlpp11/interpretable.h b/include/sqlpp11/interpretable.h index b8ddd9d5..e3090b42 100644 --- a/include/sqlpp11/interpretable.h +++ b/include/sqlpp11/interpretable.h @@ -39,7 +39,7 @@ namespace sqlpp using _serializer_context_t = typename Db::_serializer_context_t; template - interpretable_t(T t) : _requires_braces(requires_braces_t::value), _impl(std::make_shared<_impl_t>(t)) + interpretable_t(T t) : _requires_parens(requires_parens_t::value), _impl(std::make_shared<_impl_t>(t)) { } @@ -54,7 +54,7 @@ namespace sqlpp return _impl->interpret(context); } - bool _requires_braces; + bool _requires_parens; private: struct _impl_base @@ -86,7 +86,7 @@ namespace sqlpp template Context& serialize(const interpretable_t& t, Context& context) { - if (t._requires_braces) + if (t._requires_parens) { context << '('; t.interpret(context); diff --git a/include/sqlpp11/named_interpretable.h b/include/sqlpp11/named_interpretable.h index 544bb9e3..bd829780 100644 --- a/include/sqlpp11/named_interpretable.h +++ b/include/sqlpp11/named_interpretable.h @@ -39,7 +39,7 @@ namespace sqlpp using _serializer_context_t = typename Db::_serializer_context_t; template - named_interpretable_t(T t) : _requires_braces(requires_braces_t::value), _impl(std::make_shared<_impl_t>(t)) + named_interpretable_t(T t) : _requires_parens(requires_parens_t::value), _impl(std::make_shared<_impl_t>(t)) { } @@ -59,7 +59,7 @@ namespace sqlpp return _impl->_get_name(); } - bool _requires_braces; + bool _requires_parens; private: struct _impl_base @@ -97,7 +97,7 @@ namespace sqlpp template Context& serialize(const named_interpretable_t& t, Context& context) { - if (t._requires_braces) + if (t._requires_parens) { context << '('; t.interpret(context); diff --git a/include/sqlpp11/select_pseudo_table.h b/include/sqlpp11/select_pseudo_table.h index ddfc59c0..8327efb8 100644 --- a/include/sqlpp11/select_pseudo_table.h +++ b/include/sqlpp11/select_pseudo_table.h @@ -58,7 +58,7 @@ namespace sqlpp using _traits = make_traits::value>>; + tag_if::value>>; using _nodes = detail::type_vector<>; select_pseudo_table_t(Select select) : _select(select) diff --git a/include/sqlpp11/serialize.h b/include/sqlpp11/serialize.h index 63a3f70d..b92bf174 100644 --- a/include/sqlpp11/serialize.h +++ b/include/sqlpp11/serialize.h @@ -34,7 +34,7 @@ namespace sqlpp template auto serialize_operand(const T& t, Context& context) -> Context& { - if (requires_braces_t::value) + if (requires_parens_t::value) { context << '('; serialize(t, context); diff --git a/include/sqlpp11/statement.h b/include/sqlpp11/statement.h index fe9f26be..6da71842 100644 --- a/include/sqlpp11/statement.h +++ b/include/sqlpp11/statement.h @@ -193,7 +193,7 @@ namespace sqlpp tag_if::value>, tag_if::value>, tag_if::value>::value>, - tag::requires_braces>; + tag::requires_parens>; using _nodes = detail::type_vector<_policies_t>; using _used_outer_tables = typename _policies_t::_all_provided_outer_tables; diff --git a/include/sqlpp11/table_alias.h b/include/sqlpp11/table_alias.h index b4870506..1be2e8cd 100644 --- a/include/sqlpp11/table_alias.h +++ b/include/sqlpp11/table_alias.h @@ -102,12 +102,12 @@ namespace sqlpp template Context& serialize(const table_alias_t& t, Context& context) { - if (requires_braces_t::value) + if (requires_parens_t
::value) { context << "("; } serialize(t._table, context); - if (requires_braces_t
::value) + if (requires_parens_t
::value) { context << ")"; } diff --git a/include/sqlpp11/type_traits.h b/include/sqlpp11/type_traits.h index b0ca4cd5..85d16f74 100644 --- a/include/sqlpp11/type_traits.h +++ b/include/sqlpp11/type_traits.h @@ -215,7 +215,7 @@ namespace sqlpp SQLPP_VALUE_TRAIT_GENERATOR(is_sort_order) SQLPP_VALUE_TRAIT_GENERATOR(is_parameter) - SQLPP_VALUE_TRAIT_GENERATOR(requires_braces) + SQLPP_VALUE_TRAIT_GENERATOR(requires_parens) SQLPP_VALUE_TRAIT_GENERATOR(enforce_null_result_treatment)