From 7e32a0a3ea3e40cf18155b6d1b0ca3a6fd7d73ac Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Mon, 2 Jun 2014 07:48:05 +0200
Subject: [PATCH] Cleaned up minor as() method mess plus some oversights

---
 include/sqlpp11/avg.h                        |  3 ++-
 include/sqlpp11/basic_expression_operators.h |  4 ++++
 include/sqlpp11/count.h                      |  3 ++-
 include/sqlpp11/exists.h                     |  3 ++-
 include/sqlpp11/functions.h                  |  3 ++-
 include/sqlpp11/max.h                        |  3 ++-
 include/sqlpp11/min.h                        |  3 ++-
 include/sqlpp11/select.h                     |  3 ++-
 include/sqlpp11/sum.h                        |  3 ++-
 include/sqlpp11/vendor/concat.h              |  3 ++-
 include/sqlpp11/vendor/expression.h          | 15 ++++++++++-----
 include/sqlpp11/vendor/extra_tables.h        |  2 +-
 include/sqlpp11/vendor/from.h                |  2 +-
 include/sqlpp11/vendor/in.h                  |  3 ++-
 include/sqlpp11/vendor/is_null.h             |  3 ++-
 include/sqlpp11/vendor/like.h                |  3 ++-
 include/sqlpp11/vendor/offset.h              |  8 ++++----
 include/sqlpp11/vendor/select_column_list.h  |  2 ++
 tests/CMakeLists.txt                         |  4 ++--
 tests/SelectTypeTest.cpp                     | 11 +++++------
 20 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/include/sqlpp11/avg.h b/include/sqlpp11/avg.h
index 2854a8d6..50ca491c 100644
--- a/include/sqlpp11/avg.h
+++ b/include/sqlpp11/avg.h
@@ -34,7 +34,8 @@ namespace sqlpp
 	namespace vendor
 	{
 		template<typename Flag, typename Expr>
-		struct avg_t: public floating_point::template expression_operators<avg_t<Flag, Expr>>
+		struct avg_t: public floating_point::template expression_operators<avg_t<Flag, Expr>>,
+									public alias_operators<avg_t<Flag, Expr>>
 		{
 			using _traits = make_traits<floating_point, ::sqlpp::tag::expression, ::sqlpp::tag::named_expression>;
 			using _recursive_traits = make_recursive_traits<Expr>;
diff --git a/include/sqlpp11/basic_expression_operators.h b/include/sqlpp11/basic_expression_operators.h
index e306542d..d1f06749 100644
--- a/include/sqlpp11/basic_expression_operators.h
+++ b/include/sqlpp11/basic_expression_operators.h
@@ -139,7 +139,11 @@ namespace sqlpp
 					static_assert(detail::all_t<_is_valid_comparison_operand<vendor::wrap_operand_t<T>>::value...>::value, "at least one operand of in() is not valid");
 					return { *static_cast<const Base*>(this), vendor::wrap_operand_t<T>{t}... };
 				}
+		};
 
+	template<typename Base>
+		struct alias_operators
+		{
 			template<typename alias_provider>
 				expression_alias_t<Base, alias_provider> as(const alias_provider&)
 				{
diff --git a/include/sqlpp11/count.h b/include/sqlpp11/count.h
index eec747be..838189a6 100644
--- a/include/sqlpp11/count.h
+++ b/include/sqlpp11/count.h
@@ -35,7 +35,8 @@ namespace sqlpp
 	namespace vendor
 	{
 		template<typename Flag, typename Expr>
-		struct count_t: public sqlpp::detail::integral::template expression_operators<count_t<Flag, Expr>>
+		struct count_t: public sqlpp::detail::integral::template expression_operators<count_t<Flag, Expr>>,
+										public alias_operators<count_t<Flag, Expr>>
 		{
 			using _traits = make_traits<::sqlpp::detail::integral, ::sqlpp::tag::expression, ::sqlpp::tag::named_expression>;
 			using _recursive_traits = make_recursive_traits<Expr>;
diff --git a/include/sqlpp11/exists.h b/include/sqlpp11/exists.h
index 7469af47..8d767754 100644
--- a/include/sqlpp11/exists.h
+++ b/include/sqlpp11/exists.h
@@ -34,7 +34,8 @@ namespace sqlpp
 	namespace vendor
 	{
 		template<typename Select>
-		struct exists_t: public boolean::template expression_operators<exists_t<Select>>
+		struct exists_t: public boolean::template expression_operators<exists_t<Select>>,
+										 public alias_operators<exists_t<Select>>
 		{
 			using _traits = make_traits<boolean, ::sqlpp::tag::expression, ::sqlpp::tag::named_expression>;
 			using _recursive_traits = make_recursive_traits<Select>;
diff --git a/include/sqlpp11/functions.h b/include/sqlpp11/functions.h
index c05f46a3..16742105 100644
--- a/include/sqlpp11/functions.h
+++ b/include/sqlpp11/functions.h
@@ -55,7 +55,8 @@ namespace sqlpp
 		}
 
 	template<typename ValueType> // Csaba Csoma suggests: unsafe_sql instead of verbatim
-	struct verbatim_t: public ValueType::template expression_operators<verbatim_t<ValueType>>
+	struct verbatim_t: public ValueType::template expression_operators<verbatim_t<ValueType>>,
+										 public alias_operators<verbatim_t<ValueType>>
 	{
 		using _traits = make_traits<ValueType, ::sqlpp::tag::expression>;
 		using _recursive_traits = make_recursive_traits<>;
diff --git a/include/sqlpp11/max.h b/include/sqlpp11/max.h
index faf903fb..582d6a9f 100644
--- a/include/sqlpp11/max.h
+++ b/include/sqlpp11/max.h
@@ -34,7 +34,8 @@ namespace sqlpp
 	namespace vendor
 	{
 		template<typename Expr>
-		struct max_t: public value_type_of<Expr>::template expression_operators<max_t<Expr>>
+		struct max_t: public value_type_of<Expr>::template expression_operators<max_t<Expr>>,
+									public alias_operators<max_t<Expr>>
 		{
 			using _traits = make_traits<value_type_of<Expr>, ::sqlpp::tag::expression, ::sqlpp::tag::named_expression>;
 			using _recursive_traits = make_recursive_traits<Expr>;
diff --git a/include/sqlpp11/min.h b/include/sqlpp11/min.h
index f83316fd..5930a48c 100644
--- a/include/sqlpp11/min.h
+++ b/include/sqlpp11/min.h
@@ -34,7 +34,8 @@ namespace sqlpp
 	namespace vendor
 	{
 		template<typename Expr>
-		struct min_t: public value_type_of<Expr>::template expression_operators<min_t<Expr>>
+		struct min_t: public value_type_of<Expr>::template expression_operators<min_t<Expr>>,
+									public alias_operators<min_t<Expr>>
 		{
 			using _traits = make_traits<value_type_of<Expr>, ::sqlpp::tag::expression, ::sqlpp::tag::named_expression>;
 			using _recursive_traits = make_recursive_traits<Expr>;
diff --git a/include/sqlpp11/select.h b/include/sqlpp11/select.h
index a111c3cb..d9c56574 100644
--- a/include/sqlpp11/select.h
+++ b/include/sqlpp11/select.h
@@ -186,13 +186,14 @@ namespace sqlpp
 			struct serializer_t<Context, select_t<Database, Policies...>>
 			{
 				using T = select_t<Database, Policies...>;
+				using P = ::sqlpp::detail::select_policies_t<Database, Policies...>;
 
 				static Context& _(const T& t, Context& context)
 				{
 					context << "SELECT ";
 
 					using swallow = int[]; 
-					(void) swallow{(serialize(static_cast<const Policies&>(t)._data, context), 0)...};
+					(void) swallow{(serialize(static_cast<const typename Policies::template _member_t<P>&>(t)()._data, context), 0)...};
 
 					return context;
 				}
diff --git a/include/sqlpp11/sum.h b/include/sqlpp11/sum.h
index d258ca2d..7487a5b9 100644
--- a/include/sqlpp11/sum.h
+++ b/include/sqlpp11/sum.h
@@ -34,7 +34,8 @@ namespace sqlpp
 	namespace vendor
 	{
 		template<typename Flag, typename Expr>
-		struct sum_t: public value_type_of<Expr>::template expression_operators<sum_t<Flag, Expr>>
+		struct sum_t: public value_type_of<Expr>::template expression_operators<sum_t<Flag, Expr>>,
+									public alias_operators<sum_t<Flag, Expr>>
 		{
 			using _traits = make_traits<value_type_of<Expr>, ::sqlpp::tag::expression, ::sqlpp::tag::named_expression>;
 			using _recursive_traits = make_recursive_traits<Expr>;
diff --git a/include/sqlpp11/vendor/concat.h b/include/sqlpp11/vendor/concat.h
index a5daa2d3..7a93c6ad 100644
--- a/include/sqlpp11/vendor/concat.h
+++ b/include/sqlpp11/vendor/concat.h
@@ -37,7 +37,8 @@ namespace sqlpp
 	{
 		// FIXME: Remove First, inherit from text_t
 		template<typename First, typename... Args>
-			struct concat_t: public value_type_of<First>::template expression_operators<concat_t<First, Args...>>
+			struct concat_t: public value_type_of<First>::template expression_operators<concat_t<First, Args...>>,
+											 public alias_operators<concat_t<First, Args...>>
 		{
 			using _traits = make_traits<value_type_of<First>, ::sqlpp::tag::expression, ::sqlpp::tag::named_expression>;
 			using _recursive_traits = make_recursive_traits<First, Args...>;
diff --git a/include/sqlpp11/vendor/expression.h b/include/sqlpp11/vendor/expression.h
index 03c89cba..17ef6e9e 100644
--- a/include/sqlpp11/vendor/expression.h
+++ b/include/sqlpp11/vendor/expression.h
@@ -40,7 +40,8 @@ namespace sqlpp
 	namespace vendor
 	{
 		template<typename Lhs, typename Rhs>
-			struct binary_expression_t<Lhs, op::equal_to, Rhs>: public ::sqlpp::detail::boolean::template expression_operators<equal_to_t<Lhs, Rhs>>
+			struct binary_expression_t<Lhs, op::equal_to, Rhs>: public ::sqlpp::detail::boolean::template expression_operators<binary_expression_t<Lhs, op::equal_to, Rhs>>,
+																													public alias_operators<binary_expression_t<Lhs, op::equal_to, Rhs>>
 		{
 			using _traits = make_traits<boolean, sqlpp::tag::expression>;
 			using _recursive_traits = make_recursive_traits<Lhs, Rhs>;
@@ -84,7 +85,8 @@ namespace sqlpp
 			};
 
 		template<typename Lhs, typename Rhs>
-			struct binary_expression_t<Lhs, op::not_equal_to, Rhs>: public ::sqlpp::detail::boolean::template expression_operators<not_equal_to_t<Lhs, Rhs>>
+			struct binary_expression_t<Lhs, op::not_equal_to, Rhs>: public ::sqlpp::detail::boolean::template expression_operators<binary_expression_t<Lhs, op::not_equal_to, Rhs>>,
+																															public alias_operators<binary_expression_t<Lhs, op::not_equal_to, Rhs>>
 		{
 			using _traits = make_traits<boolean, sqlpp::tag::expression>;
 			using _recursive_traits = make_recursive_traits<Lhs, Rhs>;
@@ -128,7 +130,8 @@ namespace sqlpp
 			};
 
 		template<typename Rhs>
-			struct unary_expression_t<op::logical_not, Rhs>: public ::sqlpp::detail::boolean::template expression_operators<logical_not_t<Rhs>>
+			struct unary_expression_t<op::logical_not, Rhs>: public ::sqlpp::detail::boolean::template expression_operators<unary_expression_t<op::logical_not, Rhs>>,
+																											 public alias_operators<unary_expression_t<op::logical_not, Rhs>>
 		{
 			using _traits = make_traits<boolean, sqlpp::tag::expression>;
 			using _recursive_traits = make_recursive_traits<Rhs>;
@@ -162,7 +165,8 @@ namespace sqlpp
 			};
 
 		template<typename Lhs, typename O, typename Rhs>
-			struct binary_expression_t: public value_type_of<O>::template expression_operators<binary_expression_t<Lhs, O, Rhs>>
+			struct binary_expression_t: public value_type_of<O>::template expression_operators<binary_expression_t<Lhs, O, Rhs>>,
+																  public alias_operators<binary_expression_t<Lhs, O, Rhs>>
 		{
 			using _traits = make_traits<value_type_of<O>, sqlpp::tag::expression>;
 			using _recursive_traits = make_recursive_traits<Lhs, Rhs>;
@@ -199,7 +203,8 @@ namespace sqlpp
 			};
 
 		template<typename O, typename Rhs>
-			struct unary_expression_t: public O::_value_type::template expression_operators<unary_expression_t<O, Rhs>>
+			struct unary_expression_t: public O::_value_type::template expression_operators<unary_expression_t<O, Rhs>>,
+																 public alias_operators<unary_expression_t<O, Rhs>>
 		{
 			using _traits = make_traits<value_type_of<O>, sqlpp::tag::expression>;
 			using _recursive_traits = make_recursive_traits<Rhs>;
diff --git a/include/sqlpp11/vendor/extra_tables.h b/include/sqlpp11/vendor/extra_tables.h
index 5496518c..3feaac4c 100644
--- a/include/sqlpp11/vendor/extra_tables.h
+++ b/include/sqlpp11/vendor/extra_tables.h
@@ -156,7 +156,7 @@ namespace sqlpp
 		template<typename Context, typename Database, typename... Tables>
 			struct serializer_t<Context, extra_tables_data_t<Database, Tables...>>
 			{
-				using T = extra_tables_t<Database, Tables...>;
+				using T = extra_tables_data_t<Database, Tables...>;
 
 				static Context& _(const T& t, Context& context)
 				{
diff --git a/include/sqlpp11/vendor/from.h b/include/sqlpp11/vendor/from.h
index 0c3fb76a..308dfed3 100644
--- a/include/sqlpp11/vendor/from.h
+++ b/include/sqlpp11/vendor/from.h
@@ -191,7 +191,7 @@ namespace sqlpp
 		template<typename Context, typename Database, typename... Tables>
 			struct serializer_t<Context, from_data_t<Database, Tables...>>
 			{
-				using T = from_t<Database, Tables...>;
+				using T = from_data_t<Database, Tables...>;
 
 				static Context& _(const T& t, Context& context)
 				{
diff --git a/include/sqlpp11/vendor/in.h b/include/sqlpp11/vendor/in.h
index 54fec7b7..ea4b9470 100644
--- a/include/sqlpp11/vendor/in.h
+++ b/include/sqlpp11/vendor/in.h
@@ -37,7 +37,8 @@ namespace sqlpp
 	namespace vendor
 	{
 		template<bool NotInverted, typename Operand, typename... Args>
-			struct in_t: public boolean::template expression_operators<in_t<NotInverted, Operand, Args...>>
+			struct in_t: public boolean::template expression_operators<in_t<NotInverted, Operand, Args...>>,
+									 public alias_operators<in_t<NotInverted, Operand, Args...>>
 		{
 			using _traits = make_traits<boolean, ::sqlpp::tag::expression, ::sqlpp::tag::named_expression>;
 			using _recursive_traits = make_recursive_traits<Operand, Args...>;
diff --git a/include/sqlpp11/vendor/is_null.h b/include/sqlpp11/vendor/is_null.h
index d47d5aa7..ad212cca 100644
--- a/include/sqlpp11/vendor/is_null.h
+++ b/include/sqlpp11/vendor/is_null.h
@@ -36,7 +36,8 @@ namespace sqlpp
 	namespace vendor
 	{
 		template<bool NotInverted, typename Operand>
-		struct is_null_t: public boolean::template expression_operators<is_null_t<NotInverted, Operand>>
+		struct is_null_t: public boolean::template expression_operators<is_null_t<NotInverted, Operand>>,
+											public alias_operators<is_null_t<NotInverted, Operand>>
 		{
 			using _traits = make_traits<boolean, ::sqlpp::tag::expression, ::sqlpp::tag::named_expression>;
 			using _recursive_traits = make_recursive_traits<Operand>;
diff --git a/include/sqlpp11/vendor/like.h b/include/sqlpp11/vendor/like.h
index fd782853..bb58030d 100644
--- a/include/sqlpp11/vendor/like.h
+++ b/include/sqlpp11/vendor/like.h
@@ -36,7 +36,8 @@ namespace sqlpp
 	namespace vendor
 	{
 		template<typename Operand, typename Pattern>
-			struct like_t: public boolean::template expression_operators<like_t<Operand, Pattern>>
+			struct like_t: public boolean::template expression_operators<like_t<Operand, Pattern>>,
+										 public alias_operators<like_t<Operand, Pattern>>
 		{
 			using _traits = make_traits<boolean, ::sqlpp::tag::expression, ::sqlpp::tag::named_expression>;
 			using _recursive_traits = make_recursive_traits<Operand, Pattern>;
diff --git a/include/sqlpp11/vendor/offset.h b/include/sqlpp11/vendor/offset.h
index 9ace773f..65113beb 100644
--- a/include/sqlpp11/vendor/offset.h
+++ b/include/sqlpp11/vendor/offset.h
@@ -237,9 +237,9 @@ namespace sqlpp
 
 		// Interpreters
 		template<typename Context, typename Offset>
-			struct serializer_t<Context, offset_t<Offset>>
+			struct serializer_t<Context, offset_data_t<Offset>>
 			{
-				using T = offset_t<Offset>;
+				using T = offset_data_t<Offset>;
 
 				static Context& _(const T& t, Context& context)
 				{
@@ -250,9 +250,9 @@ namespace sqlpp
 			};
 
 		template<typename Context, typename Database>
-			struct serializer_t<Context, dynamic_offset_t<Database>>
+			struct serializer_t<Context, dynamic_offset_data_t<Database>>
 			{
-				using T = dynamic_offset_t<Database>;
+				using T = dynamic_offset_data_t<Database>;
 
 				static Context& _(const T& t, Context& context)
 				{
diff --git a/include/sqlpp11/vendor/select_column_list.h b/include/sqlpp11/vendor/select_column_list.h
index 42c8a722..46fed623 100644
--- a/include/sqlpp11/vendor/select_column_list.h
+++ b/include/sqlpp11/vendor/select_column_list.h
@@ -131,6 +131,8 @@ namespace sqlpp
 		template<typename Database, typename... Columns>
 			struct select_column_list_data_t
 			{
+				using _is_dynamic = typename std::conditional<std::is_same<Database, void>::value, std::false_type, std::true_type>::type;
+
 				select_column_list_data_t(Columns... columns):
 					_columns(columns...)
 				{}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 71f89d92..ad2d430a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -10,8 +10,8 @@ endmacro ()
 #build_and_run(InsertTest)
 #build_and_run(RemoveTest)
 #build_and_run(UpdateTest)
-build_and_run(SelectTest)
-#build_and_run(SelectTypeTest)
+#build_and_run(SelectTest)
+build_and_run(SelectTypeTest)
 #build_and_run(FunctionTest)
 #build_and_run(PreparedTest)
 
diff --git a/tests/SelectTypeTest.cpp b/tests/SelectTypeTest.cpp
index 39aa6b52..396c569b 100644
--- a/tests/SelectTypeTest.cpp
+++ b/tests/SelectTypeTest.cpp
@@ -311,10 +311,10 @@ int main()
 
 	{
 		auto s = dynamic_select(db, all_of(t)).dynamic_from().dynamic_where().dynamic_limit().dynamic_offset();
-		s.add_from(t);
-		s.add_where_ntc(t.alpha > 7 and t.alpha == any(select(t.alpha).from(t).where(t.alpha < 3)));
-		s.set_limit(30);
-		s.set_limit(3);
+		s.from.add(t);
+		s.where.add_ntc(t.alpha > 7 and t.alpha == any(select(t.alpha).from(t).where(t.alpha < 3)));
+		s.limit.set(30);
+		s.limit.set(3);
 		std::cerr << "------------------------\n";
 		serialize(s, printer).str();
 		std::cerr << "------------------------\n";
@@ -325,7 +325,7 @@ int main()
 	// Test that select can be called with zero columns if it is used with dynamic columns.
 	{
 		auto s = dynamic_select(db).dynamic_columns().extra_tables(t);
-		s.add_column(t.alpha);
+		s.selected_columns.add(t.alpha);
 		serialize(s, printer).str();
 	}
 
@@ -387,6 +387,5 @@ int main()
 		.as(alias::a)
 		;
 
-
 	return 0;
 }