From 4ef00a03b21c2c13237f129b9b06e57f07d27670 Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Mon, 17 Nov 2014 15:03:34 +0100
Subject: [PATCH 1/4] Added central _run/_prepare methods

---
 include/sqlpp11/statement.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/include/sqlpp11/statement.h b/include/sqlpp11/statement.h
index e0d48437..6f6f5afc 100644
--- a/include/sqlpp11/statement.h
+++ b/include/sqlpp11/statement.h
@@ -189,6 +189,19 @@ namespace sqlpp
 			(void) swallow{(Policies::template _methods_t<detail::statement_policies_t<Db, Policies...>>::_check_consistency(), 0)...};
 		}
 
+		template<typename Database>
+		auto _run(Database& db) const	-> decltype(std::declval<_result_methods_t<statement_t>>()._run(db))
+		{
+			return _result_methods_t<statement_t>::_run(db);
+		}
+
+		template<typename Database>
+		auto _prepare(Database& db) const	-> decltype(std::declval<_result_methods_t<statement_t>>()._prepare(db))
+		{
+			return _result_methods_t<statement_t>::_prepare(db);
+		}
+
+
 
 	};
 

From 59734b3f5103f2effc4e5896f39fbd57c7595032 Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Mon, 17 Nov 2014 19:05:22 +0100
Subject: [PATCH 2/4] Moved static asserts for inconsistency errors much closer
 to call site

---
 include/sqlpp11/custom_query.h       |  5 ++-
 include/sqlpp11/extra_tables.h       |  4 +--
 include/sqlpp11/from.h               |  4 +--
 include/sqlpp11/group_by.h           |  4 +--
 include/sqlpp11/having.h             |  4 +--
 include/sqlpp11/insert.h             | 10 ------
 include/sqlpp11/insert_value_list.h  |  6 ++--
 include/sqlpp11/into.h               |  2 +-
 include/sqlpp11/limit.h              |  6 ++--
 include/sqlpp11/noop.h               | 10 ------
 include/sqlpp11/offset.h             |  6 ++--
 include/sqlpp11/order_by.h           |  4 +--
 include/sqlpp11/remove.h             | 10 ------
 include/sqlpp11/select_column_list.h | 14 ++------
 include/sqlpp11/select_flag_list.h   |  4 +--
 include/sqlpp11/single_table.h       |  4 +--
 include/sqlpp11/statement.h          | 52 +++++++++++++++++++++-------
 include/sqlpp11/type_traits.h        | 10 ++++++
 include/sqlpp11/update.h             | 10 ------
 include/sqlpp11/update_list.h        |  2 +-
 include/sqlpp11/using.h              |  4 +--
 include/sqlpp11/where.h              | 25 ++++++++-----
 tests/MockDb.h                       | 16 ++++++++-
 tests/SelectTest.cpp                 |  8 +++--
 24 files changed, 121 insertions(+), 103 deletions(-)

diff --git a/include/sqlpp11/custom_query.h b/include/sqlpp11/custom_query.h
index 9c77bc72..a64257d1 100644
--- a/include/sqlpp11/custom_query.h
+++ b/include/sqlpp11/custom_query.h
@@ -70,17 +70,20 @@ namespace sqlpp
 		custom_query_t& operator=(custom_query_t&&) = default;
 		~custom_query_t() = default;
 
-		static void _check_consistency() {};
+		using _consistency_check = consistent_t;
 
 		template<typename Db>
 		auto _run(Db& db) const	-> decltype(std::declval<_methods_t>()._run(db, *this))
 		{
+			static_assert(_get_static_no_of_parameters() == 0, "cannot run execute directly with parameters, use prepare instead");
+			_run_check{};
 			return _methods_t::_run(db, *this);
 		}
 
 		template<typename Db>
 		auto _prepare(Db& db) const	-> decltype(std::declval<_methods_t>()._prepare(db, *this))
 		{
+			_prepare_check{};
 			return _methods_t::_prepare(db, *this);
 		}
 
diff --git a/include/sqlpp11/extra_tables.h b/include/sqlpp11/extra_tables.h
index d2fe8a73..473479b5 100644
--- a/include/sqlpp11/extra_tables.h
+++ b/include/sqlpp11/extra_tables.h
@@ -99,7 +99,7 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 				};
 		};
 
@@ -142,7 +142,7 @@ namespace sqlpp
 				template<typename T>
 					using _new_statement_t = new_statement<Policies, no_extra_tables_t, T>;
 
-				static void _check_consistency() {}
+				using _consistency_check = consistent_t;
 
 				template<typename... Args>
 					auto extra_tables(Args...) const
diff --git a/include/sqlpp11/from.h b/include/sqlpp11/from.h
index b6c9b4e6..84d107c9 100644
--- a/include/sqlpp11/from.h
+++ b/include/sqlpp11/from.h
@@ -119,7 +119,7 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 				};
 		};
 
@@ -163,7 +163,7 @@ namespace sqlpp
 				template<typename T>
 					using _new_statement_t = new_statement<Policies, no_from_t, T>;
 
-				static void _check_consistency() {}
+				using _consistency_check = consistent_t;
 
 				template<typename... Tables>
 					auto from(Tables... tables) const
diff --git a/include/sqlpp11/group_by.h b/include/sqlpp11/group_by.h
index 89792311..e9bd0e9d 100644
--- a/include/sqlpp11/group_by.h
+++ b/include/sqlpp11/group_by.h
@@ -128,7 +128,7 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 				};
 		};
 
@@ -172,7 +172,7 @@ namespace sqlpp
 				template<typename T>
 					using _new_statement_t = new_statement<Policies, no_group_by_t, T>;
 
-				static void _check_consistency() {}
+				using _consistency_check = consistent_t;
 
 				template<typename... Args>
 					auto group_by(Args... args) const
diff --git a/include/sqlpp11/having.h b/include/sqlpp11/having.h
index cd412c7c..b43f73e9 100644
--- a/include/sqlpp11/having.h
+++ b/include/sqlpp11/having.h
@@ -126,7 +126,7 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 				};
 		};
 
@@ -170,7 +170,7 @@ namespace sqlpp
 				template<typename T>
 					using _new_statement_t = new_statement<Policies, no_having_t, T>;
 
-				static void _check_consistency() {}
+				using _consistency_check = consistent_t;
 
 				template<typename... Args>
 					auto having(Args... args) const
diff --git a/include/sqlpp11/insert.h b/include/sqlpp11/insert.h
index 59091a04..52f1e749 100644
--- a/include/sqlpp11/insert.h
+++ b/include/sqlpp11/insert.h
@@ -61,18 +61,12 @@ namespace sqlpp
 					auto _run(Db& db, const Composite& composite) const
 					-> decltype(db.insert(composite))
 					{
-						Composite::_check_consistency();
-						static_assert(Composite::_get_static_no_of_parameters() == 0, "cannot run insert directly with parameters, use prepare instead");
-
 						return db.insert(composite);
 					}
 
 				template<typename Db>
 					auto _run(Db& db) const -> decltype(db.insert(this->_get_statement()))
 					{
-						_statement_t::_check_consistency();
-
-						static_assert(_statement_t::_get_static_no_of_parameters() == 0, "cannot run insert directly with parameters, use prepare instead");
 						return db.insert(_get_statement());
 					}
 
@@ -81,8 +75,6 @@ namespace sqlpp
 					auto _prepare(Db& db, const Composite& composite) const
 					-> prepared_insert_t<Db, Composite>
 					{
-						Composite::_check_consistency();
-
 						return {{}, db.prepare_insert(composite)};
 					}
 
@@ -90,8 +82,6 @@ namespace sqlpp
 					auto _prepare(Db& db) const
 					-> prepared_insert_t<Db, _statement_t>
 					{
-						_statement_t::_check_consistency();
-
 						return {{}, db.prepare_insert(_get_statement())};
 					}
 			};
diff --git a/include/sqlpp11/insert_value_list.h b/include/sqlpp11/insert_value_list.h
index 8f07b51e..c3e63a25 100644
--- a/include/sqlpp11/insert_value_list.h
+++ b/include/sqlpp11/insert_value_list.h
@@ -96,7 +96,7 @@ namespace sqlpp
 		template<typename Policies>
 			struct _methods_t
 			{
-				static void _check_consistency() {}
+				using _consistency_check = consistent_t;
 			};
 	}; 
 
@@ -200,7 +200,7 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 				};
 
 		};
@@ -288,7 +288,7 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 				};
 		};
 
diff --git a/include/sqlpp11/into.h b/include/sqlpp11/into.h
index e1d2ddd5..e6a5bfdb 100644
--- a/include/sqlpp11/into.h
+++ b/include/sqlpp11/into.h
@@ -96,7 +96,7 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 				};
 
 		};
diff --git a/include/sqlpp11/limit.h b/include/sqlpp11/limit.h
index 40b756ce..49266fb8 100644
--- a/include/sqlpp11/limit.h
+++ b/include/sqlpp11/limit.h
@@ -89,7 +89,7 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 				};
 		};
 
@@ -166,7 +166,7 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 				};
 		};
 
@@ -209,7 +209,7 @@ namespace sqlpp
 				template<typename T>
 					using _new_statement_t = new_statement<Policies, no_limit_t, T>;
 
-				static void _check_consistency() {}
+				using _consistency_check = consistent_t;
 
 				template<typename Arg>
 					auto limit(Arg arg) const
diff --git a/include/sqlpp11/noop.h b/include/sqlpp11/noop.h
index 1c1b4d61..d2341f1c 100644
--- a/include/sqlpp11/noop.h
+++ b/include/sqlpp11/noop.h
@@ -55,18 +55,12 @@ namespace sqlpp
 				template<typename Db, typename Composite>
 					auto _run(Db& db, const Composite& composite) const	-> void
 					{
-						Composite::_check_consistency();
-						static_assert(Composite::_get_static_no_of_parameters() == 0, "cannot run execute directly with parameters, use prepare instead");
-
 						return db.execute(composite);
 					}
 
 				template<typename Db>
 					auto _run(Db& db) const -> void
 					{
-						_statement_t::_check_consistency();
-
-						static_assert(_statement_t::_get_static_no_of_parameters() == 0, "cannot run insert directly with parameters, use prepare instead");
 						return db.execute(_get_statement());
 					}
 
@@ -75,8 +69,6 @@ namespace sqlpp
 					auto _prepare(Db& db, const Composite& composite) const
 					-> prepared_execute_t<Db, Composite>
 					{
-						Composite::_check_consistency();
-
 						return {{}, db.prepare_execute(composite)};
 					}
 
@@ -84,8 +76,6 @@ namespace sqlpp
 					auto _prepare(Db& db) const
 					-> prepared_execute_t<Db, _statement_t>
 					{
-						_statement_t::_check_consistency();
-
 						return {{}, db.prepare_execute(_get_statement())};
 					}
 			};
diff --git a/include/sqlpp11/offset.h b/include/sqlpp11/offset.h
index 5d0b4b3b..bc8d6769 100644
--- a/include/sqlpp11/offset.h
+++ b/include/sqlpp11/offset.h
@@ -89,7 +89,7 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 				};
 		};
 
@@ -165,7 +165,7 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 
 					template<typename Offset>
 						void set_offset(Offset value)
@@ -220,7 +220,7 @@ namespace sqlpp
 				template<typename T>
 					using _new_statement_t = new_statement<Policies, no_offset_t, T>;
 
-				static void _check_consistency() {}
+				using _consistency_check = consistent_t;
 
 				template<typename Arg>
 					auto offset(Arg arg) const
diff --git a/include/sqlpp11/order_by.h b/include/sqlpp11/order_by.h
index 8d761989..c27cf92b 100644
--- a/include/sqlpp11/order_by.h
+++ b/include/sqlpp11/order_by.h
@@ -128,7 +128,7 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 				};
 		};
 
@@ -172,7 +172,7 @@ namespace sqlpp
 				template<typename T>
 					using _new_statement_t = new_statement<Policies, no_order_by_t, T>;
 
-				static void _check_consistency() {}
+				using _consistency_check = consistent_t;
 
 				template<typename... Args>
 					auto order_by(Args... args) const
diff --git a/include/sqlpp11/remove.h b/include/sqlpp11/remove.h
index 00890eaf..a74cc710 100644
--- a/include/sqlpp11/remove.h
+++ b/include/sqlpp11/remove.h
@@ -61,18 +61,12 @@ namespace sqlpp
 					auto _run(Db& db, const Composite& composite) const
 					-> decltype(db.remove(composite))
 					{
-						Composite::_check_consistency();
-						static_assert(Composite::_get_static_no_of_parameters() == 0, "cannot run remove directly with parameters, use prepare instead");
-
 						return db.remove(composite);
 					}
 
 				template<typename Db>
 					auto _run(Db& db) const -> decltype(db.remove(this->_get_statement()))
 					{
-						_statement_t::_check_consistency();
-
-						static_assert(_statement_t::_get_static_no_of_parameters() == 0, "cannot run remove directly with parameters, use prepare instead");
 						return db.remove(_get_statement());
 					}
 
@@ -81,8 +75,6 @@ namespace sqlpp
 					auto _prepare(Db& db, const Composite& composite) const
 					-> prepared_remove_t<Db, Composite>
 					{
-						Composite::_check_consistency();
-
 						return {{}, db.prepare_remove(composite)};
 					}
 
@@ -90,8 +82,6 @@ namespace sqlpp
 					auto _prepare(Db& db) const
 					-> prepared_remove_t<Db, _statement_t>
 					{
-						_statement_t::_check_consistency();
-
 						return {{}, db.prepare_remove(_get_statement())};
 					}
 			};
diff --git a/include/sqlpp11/select_column_list.h b/include/sqlpp11/select_column_list.h
index 4dc12f1b..627c37ff 100644
--- a/include/sqlpp11/select_column_list.h
+++ b/include/sqlpp11/select_column_list.h
@@ -231,7 +231,7 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 				};
 
 			// Result methods
@@ -297,9 +297,6 @@ namespace sqlpp
 						auto _run(Db& db, const Composite& composite) const
 						-> result_t<decltype(db.select(composite)), _result_row_t<Db>>
 						{
-							Composite::_check_consistency();
-							static_assert(Composite::_get_static_no_of_parameters() == 0, "cannot run select directly with parameters, use prepare instead");
-
 							return {db.select(composite), get_dynamic_names()};
 						}
 
@@ -307,9 +304,6 @@ namespace sqlpp
 						auto _run(Db& db) const
 						-> result_t<decltype(db.select(std::declval<_statement_t>())), _result_row_t<Db>>
 						{
-							_statement_t::_check_consistency();
-							static_assert(_statement_t::_get_static_no_of_parameters() == 0, "cannot run select directly with parameters, use prepare instead");
-
 							return {db.select(_get_statement()), get_dynamic_names()};
 						}
 
@@ -318,8 +312,6 @@ namespace sqlpp
 						auto _prepare(Db& db, const Composite& composite) const
 						-> prepared_select_t<Db, _statement_t, Composite>
 						{
-							Composite::_check_consistency();
-
 							return {make_parameter_list_t<Composite>{}, get_dynamic_names(), db.prepare_select(composite)};
 						}
 
@@ -327,8 +319,6 @@ namespace sqlpp
 						auto _prepare(Db& db) const
 						-> prepared_select_t<Db, _statement_t>
 						{
-							_statement_t::_check_consistency();
-
 							return {make_parameter_list_t<_statement_t>{}, get_dynamic_names(), db.prepare_select(_get_statement())};
 						}
 				};
@@ -385,7 +375,7 @@ namespace sqlpp
 				template<typename T>
 					using _new_statement_t = new_statement<Policies, no_select_column_list_t, T>;
 
-				static void _check_consistency() {}
+				using _consistency_check = consistent_t;
 
 				template<typename... Args>
 					auto columns(Args... args) const
diff --git a/include/sqlpp11/select_flag_list.h b/include/sqlpp11/select_flag_list.h
index 5864816d..afeaa9d4 100644
--- a/include/sqlpp11/select_flag_list.h
+++ b/include/sqlpp11/select_flag_list.h
@@ -127,7 +127,7 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 				};
 
 		};
@@ -171,7 +171,7 @@ namespace sqlpp
 				template<typename T>
 					using _new_statement_t = new_statement<Policies, no_select_flag_list_t, T>;
 
-				static void _check_consistency() {}
+				using _consistency_check = consistent_t;
 
 				template<typename... Args>
 					auto flags(Args... args) const
diff --git a/include/sqlpp11/single_table.h b/include/sqlpp11/single_table.h
index ca6566cb..f30a06c8 100644
--- a/include/sqlpp11/single_table.h
+++ b/include/sqlpp11/single_table.h
@@ -95,7 +95,7 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 				};
 
 		};
@@ -140,7 +140,7 @@ namespace sqlpp
 				template<typename T>
 					using _new_statement_t = new_statement<Policies, no_single_table_t, T>;
 
-				static void _check_consistency() {}
+				using _consistency_check = consistent_t;
 
 				template<typename... Args>
 					auto from(Args... args) const
diff --git a/include/sqlpp11/statement.h b/include/sqlpp11/statement.h
index 6f6f5afc..26e3fa96 100644
--- a/include/sqlpp11/statement.h
+++ b/include/sqlpp11/statement.h
@@ -35,6 +35,7 @@
 #include <sqlpp11/policy_update.h>
 #include <sqlpp11/serializer.h>
 
+#include <sqlpp11/detail/get_first.h>
 #include <sqlpp11/detail/get_last.h>
 #include <sqlpp11/detail/pick_arg.h>
 
@@ -43,6 +44,28 @@ namespace sqlpp
 	template<typename Db, typename... Policies>
 		struct statement_t;
 
+	struct assert_no_unknown_tables_t
+	{
+		using type = std::false_type;
+
+		template<typename T = void>
+		static void _()
+		{
+			static_assert(wrong_t<T>::value, "one clause requires tables which are otherwise not known in the statement");
+		}
+	};
+
+	struct assert_no_parameters_t
+	{
+		using type = std::false_type;
+
+		template<typename T = void>
+		static void _()
+		{
+			static_assert(wrong_t<T>::value, "cannot run statements with parameters directly, use prepare instead");
+		}
+	};
+
 	namespace detail
 	{
 		template<typename Db = void, typename... Policies>
@@ -110,7 +133,7 @@ namespace sqlpp
 
 				struct _recursive_traits
 				{
-					using _required_tables = statement_policies_t::_required_tables;
+					using _required_tables = _required_tables;
 					using _provided_tables = detail::type_set<>;
 					using _provided_outer_tables = detail::type_set<>;
 					using _extra_tables = detail::type_set<>;
@@ -119,6 +142,16 @@ namespace sqlpp
 											detail::type_set<tag::can_be_null>,
 											detail::type_set<>>::type;
 				};
+
+				using _table_check = typename std::conditional<_required_tables::size::value == 0,
+							consistent_t, assert_no_unknown_tables_t>::type;
+				using _parameter_check = typename std::conditional<std::tuple_size<typename _recursive_traits::_parameters>::value == 0,
+							consistent_t, assert_no_parameters_t>::type;
+
+				using _run_check = detail::get_first_if<is_inconsistent_t, consistent_t, 
+							_table_check, _parameter_check, typename Policies::template _methods_t<statement_policies_t>::_consistency_check...>;
+				using _prepare_check = detail::get_first_if<is_inconsistent_t, consistent_t, 
+							_table_check, typename Policies::template _methods_t<statement_policies_t>::_consistency_check...>;
 			};
 	}
 
@@ -132,6 +165,9 @@ namespace sqlpp
 				public Policies::template _methods_t<detail::statement_policies_t<Db, Policies...>>...
 	{
 		using _policies_t = typename detail::statement_policies_t<Db, Policies...>;
+		using _run_check = typename _policies_t::_run_check;
+		using _prepare_check = typename _policies_t::_prepare_check;
+
 		using _result_type_provider = typename _policies_t::_result_type_provider;
 		template<typename Composite>
 			using _result_methods_t = typename _result_type_provider::template _result_methods_t<Composite>;
@@ -181,28 +217,20 @@ namespace sqlpp
 			return _policies_t::_can_be_used_as_table();
 		}
 
-		static void _check_consistency()
-		{
-			static_assert(not required_tables_of<_policies_t>::size::value, "one sub expression requires tables which are otherwise not known in the statement");
-
-			using swallow = int[]; 
-			(void) swallow{(Policies::template _methods_t<detail::statement_policies_t<Db, Policies...>>::_check_consistency(), 0)...};
-		}
-
 		template<typename Database>
 		auto _run(Database& db) const	-> decltype(std::declval<_result_methods_t<statement_t>>()._run(db))
 		{
+			_run_check::_();
 			return _result_methods_t<statement_t>::_run(db);
 		}
 
 		template<typename Database>
 		auto _prepare(Database& db) const	-> decltype(std::declval<_result_methods_t<statement_t>>()._prepare(db))
 		{
+			_prepare_check::_();
 			return _result_methods_t<statement_t>::_prepare(db);
 		}
 
-
-
 	};
 
 	template<typename Context, typename Database, typename... Policies>
@@ -257,7 +285,7 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 				};
 		};
 
diff --git a/include/sqlpp11/type_traits.h b/include/sqlpp11/type_traits.h
index 25686dcc..d83b8ab1 100644
--- a/include/sqlpp11/type_traits.h
+++ b/include/sqlpp11/type_traits.h
@@ -239,6 +239,16 @@ namespace sqlpp
 
 	template<typename Policies>
 		using derived_statement_t = typename Policies::_statement_t;
+
+	struct consistent_t
+	{
+		using type = std::true_type;
+
+		static void _() {};
+	};
+
+	template<typename T>
+	using is_inconsistent_t = typename std::conditional<std::is_same<consistent_t, T>::value, std::false_type, std::true_type>::type;
 }
 
 #endif
diff --git a/include/sqlpp11/update.h b/include/sqlpp11/update.h
index f940fdab..49f4ee85 100644
--- a/include/sqlpp11/update.h
+++ b/include/sqlpp11/update.h
@@ -61,18 +61,12 @@ namespace sqlpp
 					auto _run(Db& db, const Composite& composite) const
 					-> decltype(db.update(composite))
 					{
-						Composite::_check_consistency();
-						static_assert(Composite::_get_static_no_of_parameters() == 0, "cannot run update directly with parameters, use prepare instead");
-
 						return db.update(composite);
 					}
 
 				template<typename Db>
 					auto _run(Db& db) const -> decltype(db.update(this->_get_statement()))
 					{
-						_statement_t::_check_consistency();
-
-						static_assert(_statement_t::_get_static_no_of_parameters() == 0, "cannot run update directly with parameters, use prepare instead");
 						return db.update(_get_statement());
 					}
 
@@ -81,8 +75,6 @@ namespace sqlpp
 					auto _prepare(Db& db, const Composite& composite) const
 					-> prepared_update_t<Db, Composite>
 					{
-						Composite::_check_consistency();
-
 						return {{}, db.prepare_update(composite)};
 					}
 
@@ -90,8 +82,6 @@ namespace sqlpp
 					auto _prepare(Db& db) const
 					-> prepared_update_t<Db, _statement_t>
 					{
-						_statement_t::_check_consistency();
-
 						return {{}, db.prepare_update(_get_statement())};
 					}
 			};
diff --git a/include/sqlpp11/update_list.h b/include/sqlpp11/update_list.h
index 425b8b8f..001a61b1 100644
--- a/include/sqlpp11/update_list.h
+++ b/include/sqlpp11/update_list.h
@@ -124,7 +124,7 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 				};
 		};
 
diff --git a/include/sqlpp11/using.h b/include/sqlpp11/using.h
index c704dfc4..1c67cfa6 100644
--- a/include/sqlpp11/using.h
+++ b/include/sqlpp11/using.h
@@ -121,7 +121,7 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 				};
 		};
 
@@ -165,7 +165,7 @@ namespace sqlpp
 				template<typename T>
 					using _new_statement_t = new_statement<Policies, no_using_t, T>;
 
-				static void _check_consistency() {}
+				using _consistency_check = consistent_t;
 
 				template<typename... Args>
 					auto using_(Args... args) const
diff --git a/include/sqlpp11/where.h b/include/sqlpp11/where.h
index 01384545..667fa7f7 100644
--- a/include/sqlpp11/where.h
+++ b/include/sqlpp11/where.h
@@ -128,7 +128,7 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 				};
 		};
 
@@ -176,11 +176,22 @@ namespace sqlpp
 			template<typename Policies>
 				struct _methods_t
 				{
-					static void _check_consistency() {}
+					using _consistency_check = consistent_t;
 				};
 
 		};
 
+	struct assert_where_t
+	{
+		using type = std::false_type;
+
+		template<typename T = void>
+			static void _()
+			{
+				static_assert(wrong_t<T>::value, "where expression required, e.g. where(true)");
+			};
+	};
+
 	// NO WHERE YET
 	template<bool WhereRequired>
 		struct no_where_t
@@ -223,12 +234,10 @@ namespace sqlpp
 					template<typename T>
 						using _new_statement_t = new_statement<Policies, no_where_t, T>;
 
-					static void _check_consistency()
-					{
-						static constexpr bool _tables_provided = (Policies::_all_provided_tables::size::value > 0);
-						static constexpr bool _required = WhereRequired and _tables_provided;
-						static_assert(not _required, "where expression required, e.g. where(true)");
-					}
+					using _consistency_check = typename std::conditional<
+						WhereRequired and (Policies::_all_provided_tables::size::value > 0),
+						assert_where_t,
+						consistent_t>::type;
 
 					template<typename... Args>
 						auto where(Args... args) const
diff --git a/tests/MockDb.h b/tests/MockDb.h
index 85bf5630..6b929cfe 100644
--- a/tests/MockDb.h
+++ b/tests/MockDb.h
@@ -107,11 +107,25 @@ struct MockDbT: public sqlpp::connection
 
 	// Directly executed statements start here
 	template<typename T>
-		auto operator() (const T& t) -> decltype(t._run(*this))
+		auto _run(const T& t, const std::true_type&) -> decltype(t._run(*this))
 		{
 			return t._run(*this);
 		}
 
+	template<typename T>
+		auto _run(const T& t, const std::false_type&) -> decltype(t._run(*this))
+		{
+			return decltype(t._run(*this)){};
+		}
+
+	template<typename T>
+		auto operator() (const T& t) -> decltype(t._run(*this))
+		{
+			T::_run_check::_();
+			using _ok = typename T::_run_check::type;
+			return _run(t, _ok{});
+		}
+
 	void execute(const std::string& command);
 
 	template<typename Statement, 
diff --git a/tests/SelectTest.cpp b/tests/SelectTest.cpp
index bbf9a3e5..1b0f9ef9 100644
--- a/tests/SelectTest.cpp
+++ b/tests/SelectTest.cpp
@@ -38,10 +38,13 @@ MockDb::_serializer_context_t printer;
 
 int main()
 {
-	test::TabFoo f; 
+	//test::TabFoo f; 
 	test::TabBar t;
 
-	sqlpp::select(t.alpha).flags(sqlpp::all).from(t);
+	db(select(all_of(t)).from(t));
+
+#if 0
+	select(t.alpha).flags(sqlpp::all).from(t);
 	for (const auto& row : db(select(all_of(t)).from(t).where(true)))
 	{
 		int64_t a = row.alpha;
@@ -98,6 +101,7 @@ int main()
 	std::cerr << serialize(stat, printer).str() << std::endl;
 
 	select(sqlpp::value(7).as(t.alpha));
+#endif
 
 	return 0;
 }

From 0b1b03fedc28f7aafba76f919da6642f6b8c3499 Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Mon, 17 Nov 2014 19:13:45 +0100
Subject: [PATCH 3/4] Added missing consistency check structs

---
 include/sqlpp11/insert_value_list.h | 16 ++++++++++++----
 include/sqlpp11/into.h              | 16 ++++++++++++----
 include/sqlpp11/update_list.h       | 16 ++++++++++++----
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/include/sqlpp11/insert_value_list.h b/include/sqlpp11/insert_value_list.h
index c3e63a25..d7355b0a 100644
--- a/include/sqlpp11/insert_value_list.h
+++ b/include/sqlpp11/insert_value_list.h
@@ -292,6 +292,17 @@ namespace sqlpp
 				};
 		};
 
+	struct assert_insert_values_t
+	{
+		using type = std::false_type;
+
+		template<typename T = void>
+			static void _()
+			{
+				static_assert(wrong_t<T>::value, "insert values required, e.g. set(...) or default_values()");
+			};
+	};
+
 	// NO INSERT COLUMNS/VALUES YET
 	struct no_insert_value_list_t
 	{
@@ -332,10 +343,7 @@ namespace sqlpp
 				template<typename T>
 					using _new_statement_t = new_statement<Policies, no_insert_value_list_t, T>;
 
-				static void _check_consistency() 
-				{
-					static_assert(wrong_t<_methods_t>::value, "insert values required, e.g. set(...) or default_values()");
-				}
+				using _consistency_check = assert_insert_values_t;
 
 				auto default_values() const
 					-> _new_statement_t<insert_default_values_t>
diff --git a/include/sqlpp11/into.h b/include/sqlpp11/into.h
index e6a5bfdb..71bb48cf 100644
--- a/include/sqlpp11/into.h
+++ b/include/sqlpp11/into.h
@@ -101,6 +101,17 @@ namespace sqlpp
 
 		};
 
+	struct assert_into_t
+	{
+		using type = std::false_type;
+
+		template<typename T = void>
+			static void _()
+			{
+				static_assert(wrong_t<T>::value, "into() required");
+			};
+	};
+
 	// NO INTO YET
 	struct no_into_t
 	{
@@ -141,10 +152,7 @@ namespace sqlpp
 				template<typename T>
 					using _new_statement_t = new_statement<Policies, no_into_t, T>;
 
-				static void _check_consistency()
-				{
-					static_assert(wrong_t<_methods_t>::value, "into() required");
-				}
+				using _consistency_check = assert_into_t;
 
 				template<typename... Args>
 					auto into(Args... args) const
diff --git a/include/sqlpp11/update_list.h b/include/sqlpp11/update_list.h
index 001a61b1..2b2edcd3 100644
--- a/include/sqlpp11/update_list.h
+++ b/include/sqlpp11/update_list.h
@@ -128,6 +128,17 @@ namespace sqlpp
 				};
 		};
 
+	struct assert_update_assignments_t
+	{
+		using type = std::false_type;
+
+		template<typename T = void>
+			static void _()
+			{
+				static_assert(wrong_t<T>::value, "update assignments required, i.e. set(...)");
+			};
+	};
+
 	struct no_update_list_t
 	{
 		using _traits = make_traits<no_value_t, tag::is_where>;
@@ -167,10 +178,7 @@ namespace sqlpp
 				template<typename T>
 					using _new_statement_t = new_statement<Policies, no_update_list_t, T>;
 
-				static void _check_consistency()
-				{
-					static_assert(wrong_t<_methods_t>::value, "update assignments required, i.e. set(...)");
-				}
+				using _consistency_check = assert_update_assignments_t;
 
 				template<typename... Assignments>
 					auto set(Assignments... assignments) const

From 3f5c48bfd5a909a32ca4a82a8b0fe0ef7707f8ad Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Mon, 17 Nov 2014 19:20:55 +0100
Subject: [PATCH 4/4] Fixed run_check and prepared_check for custom query and
 prepared statemtents

---
 include/sqlpp11/custom_query.h     | 13 ++++++++-----
 include/sqlpp11/prepared_execute.h |  2 ++
 include/sqlpp11/prepared_insert.h  |  2 ++
 include/sqlpp11/prepared_remove.h  |  2 ++
 include/sqlpp11/prepared_select.h  |  2 ++
 include/sqlpp11/prepared_update.h  |  2 ++
 tests/SelectTest.cpp               |  6 +-----
 7 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/include/sqlpp11/custom_query.h b/include/sqlpp11/custom_query.h
index a64257d1..87826ec0 100644
--- a/include/sqlpp11/custom_query.h
+++ b/include/sqlpp11/custom_query.h
@@ -56,6 +56,12 @@ namespace sqlpp
 		using _traits = make_traits<no_value_t>;
 		using _recursive_traits = make_recursive_traits<Parts...>;
 
+		using _parameter_check = typename std::conditional<std::tuple_size<typename _recursive_traits::_parameters>::value == 0,
+					consistent_t, assert_no_parameters_t>::type;
+		using _run_check = detail::get_first_if<is_inconsistent_t, consistent_t, 
+					_parameter_check>;
+		using _prepare_check = consistent_t;
+
 		custom_query_t(Parts... parts):
 			_parts(parts...)
 		{}
@@ -70,20 +76,17 @@ namespace sqlpp
 		custom_query_t& operator=(custom_query_t&&) = default;
 		~custom_query_t() = default;
 
-		using _consistency_check = consistent_t;
-
 		template<typename Db>
 		auto _run(Db& db) const	-> decltype(std::declval<_methods_t>()._run(db, *this))
 		{
-			static_assert(_get_static_no_of_parameters() == 0, "cannot run execute directly with parameters, use prepare instead");
-			_run_check{};
+			_run_check::_();
 			return _methods_t::_run(db, *this);
 		}
 
 		template<typename Db>
 		auto _prepare(Db& db) const	-> decltype(std::declval<_methods_t>()._prepare(db, *this))
 		{
-			_prepare_check{};
+			_prepare_check::_();
 			return _methods_t::_prepare(db, *this);
 		}
 
diff --git a/include/sqlpp11/prepared_execute.h b/include/sqlpp11/prepared_execute.h
index e181d37c..e9c27c9d 100644
--- a/include/sqlpp11/prepared_execute.h
+++ b/include/sqlpp11/prepared_execute.h
@@ -38,6 +38,8 @@ namespace sqlpp
 			using _parameter_list_t = make_parameter_list_t<Statement>;
 			using _prepared_statement_t = typename Db::_prepared_statement_t;
 
+			using _run_check = consistent_t;
+
 			auto _run(Db& db) const
 				-> void
 				{
diff --git a/include/sqlpp11/prepared_insert.h b/include/sqlpp11/prepared_insert.h
index e32c73c8..51c759fe 100644
--- a/include/sqlpp11/prepared_insert.h
+++ b/include/sqlpp11/prepared_insert.h
@@ -38,6 +38,8 @@ namespace sqlpp
 			using _parameter_list_t = make_parameter_list_t<Insert>;
 			using _prepared_statement_t = typename Db::_prepared_statement_t;
 
+			using _run_check = consistent_t;
+
 			auto _run(Db& db) const
 				-> size_t
 				{
diff --git a/include/sqlpp11/prepared_remove.h b/include/sqlpp11/prepared_remove.h
index 672ab5a6..3203ee1b 100644
--- a/include/sqlpp11/prepared_remove.h
+++ b/include/sqlpp11/prepared_remove.h
@@ -38,6 +38,8 @@ namespace sqlpp
 			using _parameter_list_t = make_parameter_list_t<Remove>;
 			using _prepared_statement_t = typename Db::_prepared_statement_t;
 
+			using _run_check = consistent_t;
+
 			auto _run(Db& db) const
 				-> size_t
 				{
diff --git a/include/sqlpp11/prepared_select.h b/include/sqlpp11/prepared_select.h
index 2701e17e..40553931 100644
--- a/include/sqlpp11/prepared_select.h
+++ b/include/sqlpp11/prepared_select.h
@@ -40,6 +40,8 @@ namespace sqlpp
 			using _dynamic_names_t = typename Statement::_dynamic_names_t;
 			using _prepared_statement_t = typename Database::_prepared_statement_t;
 
+			using _run_check = consistent_t;
+
 			auto _run(Database& db) const
 				-> result_t<decltype(db.run_prepared_select(*this)), _result_row_t>
 				{
diff --git a/include/sqlpp11/prepared_update.h b/include/sqlpp11/prepared_update.h
index 8d51b32d..b7f94b86 100644
--- a/include/sqlpp11/prepared_update.h
+++ b/include/sqlpp11/prepared_update.h
@@ -38,6 +38,8 @@ namespace sqlpp
 			using _parameter_list_t = make_parameter_list_t<Update>;
 			using _prepared_statement_t = typename Db::_prepared_statement_t;
 
+			using _run_check = consistent_t;
+
 			auto _run(Db& db) const
 				-> size_t
 				{
diff --git a/tests/SelectTest.cpp b/tests/SelectTest.cpp
index 1b0f9ef9..76138240 100644
--- a/tests/SelectTest.cpp
+++ b/tests/SelectTest.cpp
@@ -38,12 +38,9 @@ MockDb::_serializer_context_t printer;
 
 int main()
 {
-	//test::TabFoo f; 
+	test::TabFoo f; 
 	test::TabBar t;
 
-	db(select(all_of(t)).from(t));
-
-#if 0
 	select(t.alpha).flags(sqlpp::all).from(t);
 	for (const auto& row : db(select(all_of(t)).from(t).where(true)))
 	{
@@ -101,7 +98,6 @@ int main()
 	std::cerr << serialize(stat, printer).str() << std::endl;
 
 	select(sqlpp::value(7).as(t.alpha));
-#endif
 
 	return 0;
 }