mirror/sqlpp11
1
0
Fork 0
mirror of https://github.com/rbock/sqlpp11.git synced 2026-01-02 03:00:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

Re-arrange in() parameter checks

Browse Source
This commit is contained in:
rbock
2016-04-09 09:44:52 +02:00
parent 7abd620465
commit c199a4f6a4
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/sqlpp11/basic_expression_operators.h
View File

@@ -42,7 +42,7 @@
namespace sqlpp
{
SQLPP_PORTABLE_STATIC_ASSERT(assert_comparison_valid_rhs_operand_t, "invalid rhs operand in comparison");
SQLPP_PORTABLE_STATIC_ASSERT(assert_comparison_lhs_rhs_differ_t, "identical lhs and rhs operand types in comparison");
SQLPP_PORTABLE_STATIC_ASSERT(assert_comparison_lhs_rhs_differ_t, "identical lhs and rhs operands in comparison");
template <typename LhsType, typename RhsType>
using check_rhs_comparison_operand_t = static_combined_check_t<
@@ -56,8 +56,10 @@ namespace sqlpp
assert_comparison_valid_rhs_operand_t>,
static_check_t<not std::is_same<LhsType, RhsType>::value, assert_comparison_lhs_rhs_differ_t>>;
template <typename LhsType, typename... InTypes>
using check_rhs_in_arguments_t = static_combined_check_t<check_rhs_comparison_operand_t<LhsType, InTypes>...>;
template <typename LhsType, typename... RhsType>
using check_rhs_in_operands_t = static_combined_check_t<
static_combined_check_t<static_check_t<is_expression_t<sqlpp::wrap_operand_t<RhsType>>::value,
assert_comparison_valid_rhs_operand_t>...>>;
namespace detail
{
@@ -211,7 +213,7 @@ namespace sqlpp
template <typename... T>
typename _new_nary_expression<in_t, T...>::type in(T... t) const
{
static_combined_check_t<check_rhs_comparison_operand_t<Expr, T>...>::_();
check_rhs_in_operands_t<Expr, T...>::_();
return {*static_cast<const Expr*>(this), typename wrap_operand<T>::type{t}...};
}
@@ -225,7 +227,7 @@ namespace sqlpp
template <typename... T>
typename _new_nary_expression<not_in_t, T...>::type not_in(T... t) const
{
static_combined_check_t<check_rhs_comparison_operand_t<Expr, T>...>::_();
check_rhs_in_operands_t<Expr, T...>::_();
return {*static_cast<const Expr*>(this), typename wrap_operand<T>::type{t}...};
}