From 5c7facfdd4e068d950e02fdde511dd6d9ae734c4 Mon Sep 17 00:00:00 2001
From: Roland Bock <rbock@eudoxos.de>
Date: Sun, 27 Oct 2024 12:44:13 +0100
Subject: [PATCH] Remove deferral in select_column_list

Wow, finally!
---
 include/sqlpp11/core/clause/select_column_list.h | 12 +-----------
 include/sqlpp11/core/type_traits/aggregates.h    |  2 +-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/include/sqlpp11/core/clause/select_column_list.h b/include/sqlpp11/core/clause/select_column_list.h
index ed61fad8..a504d916 100644
--- a/include/sqlpp11/core/clause/select_column_list.h
+++ b/include/sqlpp11/core/clause/select_column_list.h
@@ -146,18 +146,8 @@ namespace sqlpp
         return static_cast<const _statement_t&>(*this);
       }
 
-      template <typename Db, typename Column>
-      struct _deferred_field_t
-      {
-        using type = make_field_spec_t<_statement_t, Column>;
-      };
-
-      template <typename Db, typename Column>
-      using _field_t = typename _deferred_field_t<Db, Column>::type;
-
-#warning: This should not require the Db parameter for deferral, see select_as.
       template <typename Db>
-      using _result_row_t = result_row_t<Db, _field_t<Db, Columns>...>;
+      using _result_row_t = result_row_t<Db, make_field_spec_t<_statement_t, Columns>...>;
 
       template <typename NameTagProvider>
       auto as(const NameTagProvider&) const
diff --git a/include/sqlpp11/core/type_traits/aggregates.h b/include/sqlpp11/core/type_traits/aggregates.h
index f8238310..fa84a1ce 100644
--- a/include/sqlpp11/core/type_traits/aggregates.h
+++ b/include/sqlpp11/core/type_traits/aggregates.h
@@ -76,7 +76,7 @@ namespace sqlpp
   struct is_aggregate_expression
       : public std::integral_constant<bool,
                                       is_aggregate_function<T>::value or
-                                          KnownAggregateColumns::template contains<T>()>
+                                          KnownAggregateColumns::template contains<T>::value>
   {
   };