From 6972758931401ebfd1ecacc860fccd04a30da8b6 Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Fri, 16 May 2014 09:33:48 +0200
Subject: [PATCH] Added extra_tables to recursive_traits

---
 include/sqlpp11/column.h              |  2 ++
 include/sqlpp11/parameter.h           |  8 +++++++-
 include/sqlpp11/select.h              |  2 +-
 include/sqlpp11/table.h               |  1 +
 include/sqlpp11/type_traits.h         | 10 ++++++++++
 include/sqlpp11/vendor/extra_tables.h |  8 ++++++++
 6 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/include/sqlpp11/column.h b/include/sqlpp11/column.h
index 8795a08b..383f94cc 100644
--- a/include/sqlpp11/column.h
+++ b/include/sqlpp11/column.h
@@ -48,8 +48,10 @@ namespace sqlpp
 		using _traits = make_traits<typename ColumnSpec::_value_type, tag::column, tag::expression, tag::named_expression>;
 		struct _recursive_traits
 		{
+			using _parameters = std::tuple<>;
 			using _provided_tables = detail::type_set<>;
 			using _required_tables = detail::type_set<Table>;
+			using _extra_tables = detail::type_set<>;
 		};
 
 		using _spec_t = ColumnSpec;
diff --git a/include/sqlpp11/parameter.h b/include/sqlpp11/parameter.h
index d13afdbf..b3769639 100644
--- a/include/sqlpp11/parameter.h
+++ b/include/sqlpp11/parameter.h
@@ -37,7 +37,13 @@ namespace sqlpp
 	struct parameter_t: public ValueType::template expression_operators<parameter_t<ValueType, NameType>>
 	{
 		using _traits = make_traits<ValueType, tag::parameter, tag::expression>;
-		using _recursive_traits = make_recursive_traits<>;
+		struct _recursive_traits
+		{
+			using _parameters = std::tuple<parameter_t>;
+			using _provided_tables = detail::type_set<>;
+			using _required_tables = detail::type_set<>;
+			using _extra_tables = detail::type_set<>;
+		};
 
 		using _instance_t = typename NameType::_name_t::template _member_t<typename ValueType::_parameter_t>;
 
diff --git a/include/sqlpp11/select.h b/include/sqlpp11/select.h
index 66eafd90..ee36c6bc 100644
--- a/include/sqlpp11/select.h
+++ b/include/sqlpp11/select.h
@@ -112,7 +112,7 @@ namespace sqlpp
 				static_assert(is_noop_t<ColumnList>::value or sqlpp::is_select_column_list_t<ColumnList>::value, "column list of select is neither naught nor a valid column list");
 				static_assert(is_noop_t<From>::value or sqlpp::is_from_t<From>::value, "from() part of select is neither naught nor a valid from()");
 
-				using _known_tables = detail::make_joined_set_t<provided_tables_of<_from_t>, provided_tables_of<_extra_tables_t>>; // FIXME, use provided_tables_of<THIS>;
+				using _known_tables = detail::make_joined_set_t<provided_tables_of<_from_t>, extra_tables_of<_extra_tables_t>>;
 
 				template<typename Expression>
 					using _no_unknown_tables = detail::is_subset_of<required_tables_of<Expression>, _known_tables>;
diff --git a/include/sqlpp11/table.h b/include/sqlpp11/table.h
index a77120ea..5f74da41 100644
--- a/include/sqlpp11/table.h
+++ b/include/sqlpp11/table.h
@@ -49,6 +49,7 @@ namespace sqlpp
 			using _parameters = std::tuple<>;
 			using _required_tables = detail::type_set<>;
 			using _provided_tables = detail::type_set<Table>;
+			using _extra_tables = detail::type_set<>;
 		};
 
 		static_assert(sizeof...(ColumnSpec), "at least one column required per table");
diff --git a/include/sqlpp11/type_traits.h b/include/sqlpp11/type_traits.h
index fe2c901d..66243bc2 100644
--- a/include/sqlpp11/type_traits.h
+++ b/include/sqlpp11/type_traits.h
@@ -162,6 +162,12 @@ namespace sqlpp
 			{
 				using type = typename T::_recursive_traits::_provided_tables;
 			};
+
+		template<typename T>
+			struct extra_table_of_impl
+			{
+				using type = typename T::_recursive_traits::_extra_tables;
+			};
 	}
 	template<typename T>
 		using value_type_of = typename detail::value_type_of_impl<T>::type;
@@ -172,6 +178,9 @@ namespace sqlpp
 	template<typename T>
 		using provided_tables_of = typename detail::provided_table_of_impl<T>::type;
 
+	template<typename T>
+		using extra_tables_of = typename detail::extra_table_of_impl<T>::type;
+
 	template<typename ValueType, typename... Tags>
 		struct make_traits
 		{
@@ -183,6 +192,7 @@ namespace sqlpp
 		{
 			using _required_tables = detail::make_joined_set_t<required_tables_of<Arguments>...>;
 			using _provided_tables = detail::make_joined_set_t<provided_tables_of<Arguments>...>;
+			using _extra_tables = detail::make_joined_set_t<extra_tables_of<Arguments>...>;
 		};
 
 }
diff --git a/include/sqlpp11/vendor/extra_tables.h b/include/sqlpp11/vendor/extra_tables.h
index 36fb431a..040b5c5f 100644
--- a/include/sqlpp11/vendor/extra_tables.h
+++ b/include/sqlpp11/vendor/extra_tables.h
@@ -40,6 +40,14 @@ namespace sqlpp
 			struct extra_tables_t
 			{
 				using _traits = make_traits<no_value_t, ::sqlpp::tag::extra_tables>;
+				struct _recursive_traits
+				{
+					using _parameters = std::tuple<>;
+					using _required_tables = ::sqlpp::detail::type_set<>;
+					using _provided_tables = ::sqlpp::detail::type_set<>;
+					using _extra_tables = ::sqlpp::detail::type_set<Tables...>;
+				};
+
 				using _recursive_traits = make_recursive_traits<Tables...>;
 
 				// FIXME: extra_tables must not require tables!