From fa8cb7b0afdea95d8fc2e5f465e77b039622b7e7 Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Sun, 25 Dec 2016 11:37:41 +0100
Subject: [PATCH] Replaced field_spec_t::is_compatible function with a class
 template.

Also removed two stand-alone union functions which did not work anyway.

Let's see if MSVC is happy now.
---
 include/sqlpp11/field_spec.h | 55 +++++++++++++++++++++---------------
 include/sqlpp11/result_row.h |  2 +-
 include/sqlpp11/union.h      |  2 ++
 3 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/include/sqlpp11/field_spec.h b/include/sqlpp11/field_spec.h
index 65320dd4..53d6189f 100644
--- a/include/sqlpp11/field_spec.h
+++ b/include/sqlpp11/field_spec.h
@@ -41,17 +41,6 @@ namespace sqlpp
     using _nodes = detail::type_vector<>;
 
     using _alias_t = NameType;
-
-    template <typename N, typename V, bool C, bool T>
-    static constexpr auto is_compatible(field_spec_t<N, V, C, T>) -> bool
-    {
-      using rhs = field_spec_t<N, V, C, T>;
-      return std::is_same<ValueType, V>::value and  // We might need to know that float can hold int, too
-             (CanBeNull or CanBeNull == C) and  // The left hand side determines the result row and therefore must allow
-                                                // NULL if the right hand side allows it
-             (NullIsTrivialValue or NullIsTrivialValue == T) and
-             std::is_same<typename _alias_t::_name_t, typename rhs::_alias_t::_name_t>::value;
-    }
   };
 
   template <typename AliasProvider, typename FieldSpecTuple>
@@ -64,19 +53,39 @@ namespace sqlpp
   template <typename AliasProvider, typename... FieldSpecs>
   struct multi_field_spec_t<AliasProvider, std::tuple<FieldSpecs...>>
   {
-    template <typename A, typename... Fs>
-    static constexpr auto is_compatible(multi_field_spec_t<A, Fs...>) ->
-        typename std::enable_if<sizeof...(Fs) == sizeof...(FieldSpecs), bool>::type
-    {
-      return logic::all_t<FieldSpecs::is_compatible(Fs{})...>::value;
-    }
+  };
 
-    template <typename A, typename... Fs>
-    static constexpr auto is_compatible(multi_field_spec_t<A, Fs...>) ->
-        typename std::enable_if<sizeof...(Fs) != sizeof...(FieldSpecs), bool>::type
-    {
-      return false;
-    }
+  template <typename Left, typename Right, typename Enable = void>
+  struct is_field_compatible
+  {
+    static constexpr auto value = false;
+  };
+
+  template <typename LeftName,
+            typename LeftValue,
+            bool LeftCanBeNull,
+            bool LeftNullIsTrivial,
+            typename RightName,
+            typename RightValue,
+            bool RightCanBeNull,
+            bool RightNullIsTrivial>
+  struct is_field_compatible<field_spec_t<LeftName, LeftValue, LeftCanBeNull, LeftNullIsTrivial>,
+                             field_spec_t<RightName, RightValue, RightCanBeNull, RightNullIsTrivial>>
+  {
+    static constexpr auto value =
+        std::is_same<typename LeftName::_name_t, typename RightName::_name_t>::value and
+        std::is_same<LeftValue, RightValue>::value and  // Same value type
+        (LeftCanBeNull or !RightCanBeNull) and  // The left hand side determines the result row and therefore must allow
+                                                // NULL if the right hand side allows it
+        (LeftNullIsTrivial or !RightNullIsTrivial);  // as above
+  };
+
+  template <typename LeftAlias, typename... LeftFields, typename RightAlias, typename... RightFields>
+  struct is_field_compatible<multi_field_spec_t<LeftAlias, std::tuple<LeftFields...>>,
+                             multi_field_spec_t<RightAlias, std::tuple<RightFields...>>,
+                             typename std::enable_if<sizeof...(LeftFields) == sizeof...(RightFields)>::type>
+  {
+    static constexpr auto value = logic::all_t<is_field_compatible<LeftFields, RightFields>::value...>::value;
   };
 
   namespace detail
diff --git a/include/sqlpp11/result_row.h b/include/sqlpp11/result_row.h
index bebe78dd..8c620322 100644
--- a/include/sqlpp11/result_row.h
+++ b/include/sqlpp11/result_row.h
@@ -262,7 +262,7 @@ namespace sqlpp
                               result_row_t<RDb, RFields...>,
                               typename std::enable_if<sizeof...(LFields) == sizeof...(RFields)>::type>
   {
-    static constexpr auto value = logic::all_t<LFields::is_compatible(RFields{})...>::value;
+    static constexpr auto value = logic::all_t<is_field_compatible<LFields, RFields>::value...>::value;
   };
 
   template <typename Db, typename... FieldSpecs>
diff --git a/include/sqlpp11/union.h b/include/sqlpp11/union.h
index 624e5ff2..dd15400d 100644
--- a/include/sqlpp11/union.h
+++ b/include/sqlpp11/union.h
@@ -253,6 +253,7 @@ namespace sqlpp
     };
   };
 
+  /*
   template <typename T>
   auto union_all(T&& t) -> decltype(statement_t<void, no_union_t>().union_all(std::forward<T>(t)))
   {
@@ -264,6 +265,7 @@ namespace sqlpp
   {
     return statement_t<void, no_union_t>().union_distinct(std::forward<T>(t));
   }
+  */
 }
 
 #endif