From 7f29a0b126d2b746359690ecaad4ac8c76175e0e Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Tue, 20 Aug 2019 18:32:16 +0200
Subject: [PATCH] Fix expressions for unsigned integral as suggested by
 @fraillt

---
 .../data_types/unsigned_integral/expression_operators.h   | 8 ++++----
 tests/SelectType.cpp                                      | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/include/sqlpp11/data_types/unsigned_integral/expression_operators.h b/include/sqlpp11/data_types/unsigned_integral/expression_operators.h
index b72ce3cb..49f2a2f4 100644
--- a/include/sqlpp11/data_types/unsigned_integral/expression_operators.h
+++ b/include/sqlpp11/data_types/unsigned_integral/expression_operators.h
@@ -48,14 +48,14 @@ namespace sqlpp
   struct return_type_plus<L, R, binary_operand_check_t<L, is_unsigned_integral_t, R, is_numeric_t>>
   {
     using check = consistent_t;
-    using type = value_type_of<wrap_operand_t<R>>;
+    using type = plus_t<wrap_operand_t<L>, value_type_of<wrap_operand_t<R>>, wrap_operand_t<R>>;
   };
 
   template <typename L, typename R>
   struct return_type_minus<L, R, binary_operand_check_t<L, is_unsigned_integral_t, R, is_numeric_not_unsigned_t>>
   {
     using check = consistent_t;
-    using type = value_type_of<wrap_operand_t<R>>;
+    using type = minus_t<wrap_operand_t<L>, value_type_of<wrap_operand_t<R>>, wrap_operand_t<R>>;
   };
 
   template <typename L, typename R>
@@ -69,14 +69,14 @@ namespace sqlpp
   struct return_type_multiplies<L, R, binary_operand_check_t<L, is_unsigned_integral_t, R, is_numeric_t>>
   {
     using check = consistent_t;
-    using type = value_type_of<wrap_operand_t<R>>;
+    using type = multiplies_t<wrap_operand_t<L>, value_type_of<wrap_operand_t<R>>, wrap_operand_t<R>>;
   };
 
   template <typename L, typename R>
   struct return_type_divides<L, R, binary_operand_check_t<L, is_unsigned_integral_t, R, is_numeric_t>>
   {
     using check = consistent_t;
-    using type = value_type_of<wrap_operand_t<R>>;
+    using type = divides_t<wrap_operand_t<L>, wrap_operand_t<R>>;
   };
 
   template <typename L, typename R>
diff --git a/tests/SelectType.cpp b/tests/SelectType.cpp
index f783ce15..e98febbb 100644
--- a/tests/SelectType.cpp
+++ b/tests/SelectType.cpp
@@ -39,9 +39,9 @@ namespace alias
   SQLPP_ALIAS_PROVIDER(b)
   SQLPP_ALIAS_PROVIDER(left)
   SQLPP_ALIAS_PROVIDER(right)
-}
+}  // namespace alias
 
-int SelectType(int, char* [])
+int SelectType(int, char*[])
 {
   MockDb db = {};
   MockDb::_serializer_context_t printer = {};
@@ -163,7 +163,8 @@ int SelectType(int, char* [])
     static_assert(sqlpp::is_integral_t<sqlpp::return_type_minus_t<T, sqlpp::integral>>::value, "type requirement");
     static_assert(sqlpp::is_integral_t<sqlpp::return_type_plus_t<T, sqlpp::integral>>::value, "type requirement");
     static_assert(sqlpp::is_integral_t<sqlpp::return_type_multiplies_t<T, sqlpp::integral>>::value, "type requirement");
-    static_assert(sqlpp::is_integral_t<sqlpp::return_type_divides_t<T, sqlpp::integral>>::value, "type requirement");
+    static_assert(sqlpp::is_floating_point_t<sqlpp::return_type_divides_t<T, sqlpp::integral>>::value,
+                  "type requirement");
     static_assert(sqlpp::is_integral_t<sqlpp::return_type_minus_t<sqlpp::integral, T>>::value, "type requirement");
     static_assert(sqlpp::is_integral_t<sqlpp::return_type_plus_t<sqlpp::integral, T>>::value, "type requirement");
     static_assert(sqlpp::is_integral_t<sqlpp::return_type_multiplies_t<sqlpp::integral, T>>::value, "type requirement");