mirror/sqlpp11
1
0
Fork 0
mirror of https://github.com/rbock/sqlpp11.git synced 2026-05-04 01:49:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make sure that tvin is used in the allowed places only

Browse Source
This commit is contained in:
rbock
2014-07-22 08:51:17 +02:00
parent 0f29e255d1
commit 88062625bf
4 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sqlpp11/assignment.h
+1 -1
View File
@@ -44,7 +44,7 @@ namespace sqlpp
using _recursive_traits = make_recursive_traits<Lhs, Rhs>;
using _lhs_t = Lhs;
using _rhs_t = Rhs;
using _rhs_t = allow_tvin_t<Rhs>;
static_assert(can_be_null_t<_lhs_t>::value ? true : not (std::is_same<_rhs_t, null_t>::value or is_tvin_t<_rhs_t>::value), "column must not be null");
include/sqlpp11/expression.h
+3 -3
View File
@@ -44,7 +44,7 @@ namespace sqlpp
using _traits = make_traits<boolean, sqlpp::tag::expression>;
using _recursive_traits = make_recursive_traits<Lhs, Rhs>;
using _lhs_t = Lhs;
using _rhs_t = Rhs;
using _rhs_t = allow_tvin_t<Rhs>;
binary_expression_t(_lhs_t lhs, _rhs_t rhs):
_lhs(lhs),
@@ -91,9 +91,9 @@ namespace sqlpp
using _traits = make_traits<boolean, sqlpp::tag::expression>;
using _recursive_traits = make_recursive_traits<Lhs, Rhs>;
using _lhs_t = Lhs;
using _rhs_t = Rhs;
using _rhs_t = allow_tvin_t<Rhs>;
binary_expression_t(Lhs lhs, Rhs rhs):
binary_expression_t(Lhs lhs, _rhs_t rhs):
_lhs(lhs),
_rhs(rhs)
{}
include/sqlpp11/insert_value.h
+1 -1
View File
@@ -61,7 +61,7 @@ namespace sqlpp
using _is_insert_value = std::true_type;
using _pure_value_t = typename value_type_of<Column>::_cpp_value_type;
using _wrapped_value_t = typename wrap_operand<_pure_value_t>::type;
using _tvin_t = typename detail::type_if<tvin_t<_wrapped_value_t>, can_be_null_t<Column>::value>::type; // static asserts and SFINAE do not work together
using _tvin_t = typename detail::type_if<tvin_arg_t<_wrapped_value_t>, can_be_null_t<Column>::value>::type; // static asserts and SFINAE do not work together
using _null_t = typename detail::type_if<null_t, can_be_null_t<Column>::value>::type; // static asserts and SFINAE do not work together
insert_value_t(assignment_t<Column, _wrapped_value_t> assignment):
include/sqlpp11/tvin.h
+54 -5
View File
@@ -36,6 +36,56 @@
namespace sqlpp
{
template<typename Operand>
struct tvin_arg_t
{
using _traits = make_traits<value_type_of<Operand>, tag::expression>;
using _recursive_traits = make_recursive_traits<Operand>;
using _operand_t = Operand;
tvin_arg_t(_operand_t operand):
_value(operand)
{}
tvin_arg_t(const tvin_arg_t&) = default;
tvin_arg_t(tvin_arg_t&&) = default;
tvin_arg_t& operator=(const tvin_arg_t&) = default;
tvin_arg_t& operator=(tvin_arg_t&&) = default;
~tvin_arg_t() = default;
_operand_t _value;
};
template<typename Context, typename Operand>
struct serializer_t<Context, tvin_arg_t<Operand>>
{
using T = tvin_arg_t<Operand>;
static Context& _(const T& t, Context& context)
{
static_assert(wrong_t<Context, Operand>::value, "tvin may only be used with operators =, == and !=");
}
};
template<typename T>
struct tvin_t;
namespace detail
{
template<typename T>
struct allow_tvin_impl
{
using type = T;
};
template <typename T>
struct allow_tvin_impl<tvin_arg_t<T>>
{
using type = tvin_t<T>;
};
}
template<typename T>
using allow_tvin_t = typename detail::allow_tvin_impl<T>::type;
template<typename Operand>
struct tvin_t
{
@@ -44,8 +94,8 @@ namespace sqlpp
using _operand_t = Operand;
tvin_t(Operand operand):
_value(operand)
tvin_t(tvin_arg_t<Operand> arg):
_value(arg._value)
{}
tvin_t(const tvin_t&) = default;
tvin_t(tvin_t&&) = default;
@@ -58,7 +108,7 @@ namespace sqlpp
return _value._is_trivial();
}
Operand _value;
_operand_t _value;
};
namespace detail
@@ -77,7 +127,6 @@ namespace sqlpp
template<typename T>
using is_tvin_t = typename detail::is_tvin_impl<T>::type;
#warning: disallow tvin in other places which are not =, == or !=
template<typename Context, typename Operand>
struct serializer_t<Context, tvin_t<Operand>>
{
@@ -98,7 +147,7 @@ namespace sqlpp
};
template<typename Operand>
auto tvin(Operand operand) -> tvin_t<typename wrap_operand<Operand>::type>
auto tvin(Operand operand) -> tvin_arg_t<typename wrap_operand<Operand>::type>
{
using _operand_t = typename wrap_operand<Operand>::type;
static_assert(std::is_same<_operand_t, text_operand>::value