From 1f3e611fdfb54edd5c993a76c356632c44081e03 Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Mon, 21 Apr 2014 11:49:26 +0200
Subject: [PATCH] Added table checks to add_column and added add_column_ntc

---
 include/sqlpp11/select.h                    | 5 +++++
 include/sqlpp11/vendor/select_column_list.h | 7 +++++++
 tests/InterpretTest.cpp                     | 6 +++---
 tests/SelectTypeTest.cpp                    | 2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/include/sqlpp11/select.h b/include/sqlpp11/select.h
index 876acc3a..dc54621a 100644
--- a/include/sqlpp11/select.h
+++ b/include/sqlpp11/select.h
@@ -113,6 +113,11 @@ 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<typename _from_t::_table_set, typename _extra_tables_t::_table_set>;
+
+				template<typename Expression>
+					using _no_unknown_tables = detail::is_subset_of<typename Expression::_table_set, _known_tables>;
+
 				using _required_tables = 
 					detail::make_joined_set_t<
 						typename _flag_list_t::_table_set,
diff --git a/include/sqlpp11/vendor/select_column_list.h b/include/sqlpp11/vendor/select_column_list.h
index 7f38fad4..ebff2552 100644
--- a/include/sqlpp11/vendor/select_column_list.h
+++ b/include/sqlpp11/vendor/select_column_list.h
@@ -186,10 +186,17 @@ namespace sqlpp
 					struct _methods_t
 					{
 						template<typename NamedExpression>
+							void add_column_ntc(NamedExpression namedExpression)
+							{
+								add_column<NamedExpression, std::true_type>(namedExpression);
+							}
+
+						template<typename NamedExpression, typename Ntc = std::false_type>
 							void add_column(NamedExpression namedExpression)
 							{
 								static_assert(_is_dynamic::value, "add_column can only be called for dynamic_column");
 								static_assert(is_named_expression_t<NamedExpression>::value, "invalid named expression argument in add_column()");
+								static_assert(Ntc::value or Policies::template _no_unknown_tables<NamedExpression>::value, "named expression uses tables unknown to this statement in add_column()");
 
 								using ok = ::sqlpp::detail::all_t<sqlpp::detail::identity_t, _is_dynamic, is_named_expression_t<NamedExpression>>;
 
diff --git a/tests/InterpretTest.cpp b/tests/InterpretTest.cpp
index c931fb5a..2fd5c3a3 100644
--- a/tests/InterpretTest.cpp
+++ b/tests/InterpretTest.cpp
@@ -133,20 +133,20 @@ int main()
 
 	// dynamic select
 	{
-		auto s = dynamic_select(db).dynamic_flags().dynamic_columns();
+		auto s = dynamic_select(db).dynamic_flags().dynamic_columns().from(t);
 		s.add_column(t.beta);
 		s.add_column(t.gamma);
 		serialize(s, printer).str();
 	}
 	{
-		auto s = dynamic_select(db).dynamic_flags().dynamic_columns();
+		auto s = dynamic_select(db).dynamic_flags().dynamic_columns().from(t);
 		s.add_flag(sqlpp::distinct);
 		s.add_column(t.beta);
 		s.add_column(t.gamma);
 		serialize(s, printer).str();
 	}
 	{
-		auto s = dynamic_select(db).dynamic_flags(sqlpp::distinct).dynamic_columns(t.alpha);
+		auto s = dynamic_select(db).dynamic_flags(sqlpp::distinct).dynamic_columns(t.alpha).extra_tables(t); // Would fail to run()
 		s.add_flag(sqlpp::all);
 		s.add_column(t.beta);
 		s.add_column(t.gamma);
diff --git a/tests/SelectTypeTest.cpp b/tests/SelectTypeTest.cpp
index e0a4af64..12cf9c56 100644
--- a/tests/SelectTypeTest.cpp
+++ b/tests/SelectTypeTest.cpp
@@ -324,7 +324,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();
+		auto s = dynamic_select(db).dynamic_columns().extra_tables(t);
 		s.add_column(t.alpha);
 		serialize(s, printer).str();
 	}