From 809d42e4a17f79279a7082b4a87afd8fb6c8590f Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Tue, 25 Nov 2014 17:43:55 +0100
Subject: [PATCH] Introduced check for serializability

---
 include/sqlpp11/alias.h               |  1 +
 include/sqlpp11/all_of.h              | 14 +++++++-
 include/sqlpp11/any.h                 |  1 +
 include/sqlpp11/assignment.h          |  1 +
 include/sqlpp11/avg.h                 |  1 +
 include/sqlpp11/boolean_expression.h  |  1 +
 include/sqlpp11/column.h              |  1 +
 include/sqlpp11/concat.h              |  1 +
 include/sqlpp11/count.h               |  1 +
 include/sqlpp11/custom_query.h        |  3 +-
 include/sqlpp11/default_value.h       |  1 +
 include/sqlpp11/exists.h              |  1 +
 include/sqlpp11/expression.h          |  5 +++
 include/sqlpp11/extra_tables.h        |  1 +
 include/sqlpp11/from.h                |  2 ++
 include/sqlpp11/functions.h           |  1 +
 include/sqlpp11/group_by.h            |  1 +
 include/sqlpp11/having.h              |  1 +
 include/sqlpp11/hidden.h              |  1 +
 include/sqlpp11/in.h                  |  1 +
 include/sqlpp11/insert.h              |  1 +
 include/sqlpp11/insert_value.h        |  1 +
 include/sqlpp11/insert_value_list.h   |  3 ++
 include/sqlpp11/interpretable.h       |  1 +
 include/sqlpp11/into.h                |  1 +
 include/sqlpp11/is_null.h             |  1 +
 include/sqlpp11/join.h                |  1 +
 include/sqlpp11/like.h                |  1 +
 include/sqlpp11/limit.h               |  2 ++
 include/sqlpp11/max.h                 |  1 +
 include/sqlpp11/min.h                 |  1 +
 include/sqlpp11/multi_column.h        |  2 ++
 include/sqlpp11/named_interpretable.h |  1 +
 include/sqlpp11/no_data.h             |  1 +
 include/sqlpp11/noop.h                |  1 +
 include/sqlpp11/null.h                |  1 +
 include/sqlpp11/offset.h              |  2 ++
 include/sqlpp11/on.h                  |  1 +
 include/sqlpp11/order_by.h            |  1 +
 include/sqlpp11/parameter.h           |  1 +
 include/sqlpp11/prepared_execute.h    |  4 +++
 include/sqlpp11/prepared_insert.h     |  4 +++
 include/sqlpp11/prepared_remove.h     |  4 +++
 include/sqlpp11/prepared_select.h     |  4 +++
 include/sqlpp11/prepared_update.h     |  4 +++
 include/sqlpp11/remove.h              |  1 +
 include/sqlpp11/result_field.h        |  1 +
 include/sqlpp11/rhs_wrap.h            |  1 +
 include/sqlpp11/select.h              |  3 +-
 include/sqlpp11/select_column_list.h  |  1 +
 include/sqlpp11/select_flag_list.h    |  1 +
 include/sqlpp11/select_flags.h        |  6 ++++
 include/sqlpp11/select_pseudo_table.h |  1 +
 include/sqlpp11/serialize.h           | 10 ------
 include/sqlpp11/serializer.h          | 16 ++++++++-
 include/sqlpp11/simple_column.h       |  1 +
 include/sqlpp11/single_table.h        |  1 +
 include/sqlpp11/some.h                |  1 +
 include/sqlpp11/sort_order.h          |  1 +
 include/sqlpp11/statement.h           | 10 +++---
 include/sqlpp11/sum.h                 |  1 +
 include/sqlpp11/table.h               |  1 +
 include/sqlpp11/table_alias.h         |  1 +
 include/sqlpp11/text.h                |  1 +
 include/sqlpp11/tvin.h                | 15 +++++++-
 include/sqlpp11/type_traits.h         | 50 +++++++++++++++++++++++++++
 include/sqlpp11/update.h              |  1 +
 include/sqlpp11/update_list.h         |  1 +
 include/sqlpp11/using.h               |  1 +
 include/sqlpp11/verbatim.h            |  1 +
 include/sqlpp11/verbatim_table.h      |  1 +
 include/sqlpp11/where.h               |  2 ++
 include/sqlpp11/wrap_operand.h        |  4 +++
 tests/MockDb.h                        |  6 ++--
 74 files changed, 205 insertions(+), 21 deletions(-)

diff --git a/include/sqlpp11/alias.h b/include/sqlpp11/alias.h
index 61cccb04..22c49dcf 100644
--- a/include/sqlpp11/alias.h
+++ b/include/sqlpp11/alias.h
@@ -49,6 +49,7 @@ namespace sqlpp
 	template<typename Context, typename Expression, typename AliasProvider>
 		struct serializer_t<Context, expression_alias_t<Expression, AliasProvider>>
 		{
+			using _serialize_check = serialize_check_of<Context, Expression>;
 			using T = expression_alias_t<Expression, AliasProvider>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/all_of.h b/include/sqlpp11/all_of.h
index 021da0a8..24c8b5b6 100644
--- a/include/sqlpp11/all_of.h
+++ b/include/sqlpp11/all_of.h
@@ -51,14 +51,26 @@ namespace sqlpp
 			return {};
 		}
 
+	struct assert_no_stand_alone_all_of_t
+	{
+		using type = std::false_type;
+
+		template<typename T = void>
+		static void _()
+		{
+			static_assert(wrong_t<T>::value, "all_of(table) seems to be used outside of select");
+		}
+	};
+
 	template<typename Context, typename Table>
 		struct serializer_t<Context, all_of_t<Table>>
 		{
+			using _serialize_check = assert_no_stand_alone_all_of_t;
 			using T = all_of_t<Table>;
 
 			static Context& _(const T& t, const Context&)
 			{
-				static_assert(wrong_t<serializer_t>::value, "all_of(table) does not seem to be used in select");
+				_serialize_check::_();
 			}
 		};
 
diff --git a/include/sqlpp11/any.h b/include/sqlpp11/any.h
index 79d6aada..2cc6d8a8 100644
--- a/include/sqlpp11/any.h
+++ b/include/sqlpp11/any.h
@@ -66,6 +66,7 @@ namespace sqlpp
 	template<typename Context, typename Select>
 		struct serializer_t<Context, any_t<Select>>
 		{
+			using _serialize_check = serialize_check_of<Context, Select>;
 			using T = any_t<Select>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/assignment.h b/include/sqlpp11/assignment.h
index 1471488a..95e357cd 100644
--- a/include/sqlpp11/assignment.h
+++ b/include/sqlpp11/assignment.h
@@ -66,6 +66,7 @@ namespace sqlpp
 	template<typename Context, typename Lhs, typename Rhs>
 		struct serializer_t<Context, assignment_t<Lhs, Rhs>>
 		{
+			using _serialize_check = serialize_check_of<Context, Lhs, Rhs>;
 			using T = assignment_t<Lhs, Rhs>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/avg.h b/include/sqlpp11/avg.h
index 7fa58409..9435f573 100644
--- a/include/sqlpp11/avg.h
+++ b/include/sqlpp11/avg.h
@@ -70,6 +70,7 @@ namespace sqlpp
 	template<typename Context, typename Flag, typename Expr>
 		struct serializer_t<Context, avg_t<Flag, Expr>>
 		{
+			using _serialize_check = serialize_check_of<Context, Flag, Expr>;
 			using T = avg_t<Flag, Expr>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/boolean_expression.h b/include/sqlpp11/boolean_expression.h
index 5c8716f3..e9ba83a1 100644
--- a/include/sqlpp11/boolean_expression.h
+++ b/include/sqlpp11/boolean_expression.h
@@ -71,6 +71,7 @@ namespace sqlpp
 	template<typename Context, typename Database>
 		struct serializer_t<Context, boolean_expression_t<Database>>
 		{
+			using _serialize_check = consistent_t;
 			using T = boolean_expression_t<Database>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/column.h b/include/sqlpp11/column.h
index 65f3d88f..7ac9c982 100644
--- a/include/sqlpp11/column.h
+++ b/include/sqlpp11/column.h
@@ -115,6 +115,7 @@ namespace sqlpp
 	template<typename Context, typename... Args>
 		struct serializer_t<Context, column_t<Args...>>
 		{
+			using _serialize_check = consistent_t;
 			using T = column_t<Args...>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/concat.h b/include/sqlpp11/concat.h
index 3c37977c..1dbb1c10 100644
--- a/include/sqlpp11/concat.h
+++ b/include/sqlpp11/concat.h
@@ -71,6 +71,7 @@ namespace sqlpp
 	template<typename Context, typename First, typename... Args>
 		struct serializer_t<Context, concat_t<First, Args...>>
 		{
+			using _serialize_check = serialize_check_of<Context, First, Args...>;
 			using T = concat_t<First, Args...>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/count.h b/include/sqlpp11/count.h
index 95f30467..d3100deb 100644
--- a/include/sqlpp11/count.h
+++ b/include/sqlpp11/count.h
@@ -80,6 +80,7 @@ namespace sqlpp
 	template<typename Context, typename Flag, typename Expr>
 		struct serializer_t<Context, count_t<Flag, Expr>>
 		{
+			using _serialize_check = serialize_check_of<Context, Flag, Expr>;
 			using T = count_t<Flag, Expr>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/custom_query.h b/include/sqlpp11/custom_query.h
index 87826ec0..3a7aaf62 100644
--- a/include/sqlpp11/custom_query.h
+++ b/include/sqlpp11/custom_query.h
@@ -53,7 +53,7 @@ namespace sqlpp
 		private detail::custom_parts_t<Database, Parts...>::_result_methods_t
 	{
 		using _methods_t = typename detail::custom_parts_t<Database, Parts...>::_result_methods_t;
-		using _traits = make_traits<no_value_t>;
+		using _traits = make_traits<no_value_t, tag::is_statement>;
 		using _recursive_traits = make_recursive_traits<Parts...>;
 
 		using _parameter_check = typename std::conditional<std::tuple_size<typename _recursive_traits::_parameters>::value == 0,
@@ -113,6 +113,7 @@ namespace sqlpp
 	template<typename Context, typename Database, typename... Parts>
 		struct serializer_t<Context, custom_query_t<Database, Parts...>>
 		{
+			using _serialize_check = serialize_check_of<Context, Parts...>;
 			using T = custom_query_t<Database, Parts...>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/default_value.h b/include/sqlpp11/default_value.h
index 495f03c2..a1633305 100644
--- a/include/sqlpp11/default_value.h
+++ b/include/sqlpp11/default_value.h
@@ -42,6 +42,7 @@ namespace sqlpp
 	template<typename Context>
 		struct serializer_t<Context, default_value_t>
 		{
+			using _serialize_check = consistent_t;
 			using Operand = default_value_t;
 
 			static Context& _(const Operand& t, Context& context)
diff --git a/include/sqlpp11/exists.h b/include/sqlpp11/exists.h
index d1fe3d89..78c9f5f9 100644
--- a/include/sqlpp11/exists.h
+++ b/include/sqlpp11/exists.h
@@ -69,6 +69,7 @@ namespace sqlpp
 	template<typename Context, typename Select>
 		struct serializer_t<Context, exists_t<Select>>
 		{
+			using _serialize_check = serialize_check_of<Context, Select>;
 			using T = exists_t<Select>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/expression.h b/include/sqlpp11/expression.h
index c467c603..74e6f876 100644
--- a/include/sqlpp11/expression.h
+++ b/include/sqlpp11/expression.h
@@ -66,6 +66,7 @@ namespace sqlpp
 	template<typename Context, typename Lhs, typename Rhs>
 		struct serializer_t<Context, equal_to_t<Lhs, Rhs>>
 		{
+			using _serialize_check = serialize_check_of<Context, Lhs, Rhs>;
 			using T = equal_to_t<Lhs, Rhs>;
 
 			static Context& _(const T& t, Context& context)
@@ -114,6 +115,7 @@ namespace sqlpp
 	template<typename Context, typename Lhs, typename Rhs>
 		struct serializer_t<Context, not_equal_to_t<Lhs, Rhs>>
 		{
+			using _serialize_check = serialize_check_of<Context, Lhs, Rhs>;
 			using T = not_equal_to_t<Lhs, Rhs>;
 
 			static Context& _(const T& t, Context& context)
@@ -158,6 +160,7 @@ namespace sqlpp
 	template<typename Context, typename Rhs>
 		struct serializer_t<Context, logical_not_t<Rhs>>
 		{
+			using _serialize_check = serialize_check_of<Context, Rhs>;
 			using T = logical_not_t<Rhs>;
 
 			static Context& _(const T& t, Context& context)
@@ -205,6 +208,7 @@ namespace sqlpp
 	template<typename Context, typename Lhs, typename O, typename Rhs>
 		struct serializer_t<Context, binary_expression_t<Lhs, O, Rhs>>
 		{
+			using _serialize_check = serialize_check_of<Context, Lhs, Rhs>;
 			using T = binary_expression_t<Lhs, O, Rhs>;
 
 			static Context& _(const T& t, Context& context)
@@ -242,6 +246,7 @@ namespace sqlpp
 	template<typename Context, typename O, typename Rhs>
 		struct serializer_t<Context, unary_expression_t<O, Rhs>>
 		{
+			using _serialize_check = serialize_check_of<Context, Rhs>;
 			using T = unary_expression_t<O, Rhs>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/extra_tables.h b/include/sqlpp11/extra_tables.h
index 473479b5..3c52eff8 100644
--- a/include/sqlpp11/extra_tables.h
+++ b/include/sqlpp11/extra_tables.h
@@ -157,6 +157,7 @@ namespace sqlpp
 	template<typename Context, typename Database, typename... Tables>
 		struct serializer_t<Context, extra_tables_data_t<Database, Tables...>>
 		{
+			using _serialize_check = serialize_check_of<Context, Tables...>;
 			using T = extra_tables_data_t<Database, Tables...>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/from.h b/include/sqlpp11/from.h
index 84d107c9..c1e4fc34 100644
--- a/include/sqlpp11/from.h
+++ b/include/sqlpp11/from.h
@@ -78,6 +78,7 @@ namespace sqlpp
 							using _known_tables = detail::make_joined_set_t<provided_tables_of<Tables>...>; // Hint: Joins contain more than one table
 							using _known_table_names = detail::transform_set_t<name_of, _known_tables>;
 							static_assert(not detail::is_element_of<typename Table::_name_t, _known_table_names>::value, "Must not use the same table name twice in from()");
+#warning: need to add a check if the argument is serializable!
 
 							using ok = detail::all_t<_is_dynamic::value, is_table_t<Table>::value>;
 
@@ -205,6 +206,7 @@ namespace sqlpp
 	template<typename Context, typename Database, typename... Tables>
 		struct serializer_t<Context, from_data_t<Database, Tables...>>
 		{
+			using _serialize_check = serialize_check_of<Context, Tables...>;
 			using T = from_data_t<Database, Tables...>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/functions.h b/include/sqlpp11/functions.h
index 75eacd90..9172cb81 100644
--- a/include/sqlpp11/functions.h
+++ b/include/sqlpp11/functions.h
@@ -100,6 +100,7 @@ namespace sqlpp
 	template<typename Context, typename Container>
 		struct serializer_t<Context, value_list_t<Container>>
 		{
+			using _serialize_check = serialize_check_of<Context, wrap_operand_t<typename Container::value_type>>;
 			using T = value_list_t<Container>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/group_by.h b/include/sqlpp11/group_by.h
index e9bd0e9d..6c6fdd09 100644
--- a/include/sqlpp11/group_by.h
+++ b/include/sqlpp11/group_by.h
@@ -195,6 +195,7 @@ namespace sqlpp
 	template<typename Context, typename Database, typename... Expressions>
 		struct serializer_t<Context, group_by_data_t<Database, Expressions...>>
 		{
+			using _serialize_check = serialize_check_of<Context, Expressions...>;
 			using T = group_by_data_t<Database, Expressions...>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/having.h b/include/sqlpp11/having.h
index b43f73e9..c0cdb80f 100644
--- a/include/sqlpp11/having.h
+++ b/include/sqlpp11/having.h
@@ -193,6 +193,7 @@ namespace sqlpp
 	template<typename Context, typename Database, typename... Expressions>
 		struct serializer_t<Context, having_data_t<Database, Expressions...>>
 		{
+			using _serialize_check = serialize_check_of<Context, Expressions...>;
 			using T = having_data_t<Database, Expressions...>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/hidden.h b/include/sqlpp11/hidden.h
index e9f98cfa..3ceb4f53 100644
--- a/include/sqlpp11/hidden.h
+++ b/include/sqlpp11/hidden.h
@@ -47,6 +47,7 @@ namespace sqlpp
 	template<typename Context, typename Part>
 		struct serializer_t<Context, hidden_t<Part>>
 		{
+			using _serialize_check = consistent_t;
 			using T = hidden_t<Part>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/in.h b/include/sqlpp11/in.h
index 3d8a98a0..6726f7b5 100644
--- a/include/sqlpp11/in.h
+++ b/include/sqlpp11/in.h
@@ -73,6 +73,7 @@ namespace sqlpp
 	template<typename Context, bool NotInverted, typename Operand, typename... Args>
 		struct serializer_t<Context, in_t<NotInverted, Operand, Args...>>
 		{
+			using _serialize_check = serialize_check_of<Context, Args...>;
 			using T = in_t<NotInverted, Operand, Args...>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/insert.h b/include/sqlpp11/insert.h
index 52f1e749..9e8b81a4 100644
--- a/include/sqlpp11/insert.h
+++ b/include/sqlpp11/insert.h
@@ -90,6 +90,7 @@ namespace sqlpp
 	template<typename Context>
 		struct serializer_t<Context, insert_name_t>
 		{
+			using _serialize_check = consistent_t;
 			using T = insert_name_t;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/insert_value.h b/include/sqlpp11/insert_value.h
index 061bbd82..4845b217 100644
--- a/include/sqlpp11/insert_value.h
+++ b/include/sqlpp11/insert_value.h
@@ -103,6 +103,7 @@ namespace sqlpp
 	template<typename Context, typename ValueType>
 		struct serializer_t<Context, insert_value_t<ValueType>>
 		{
+			using _serialize_check = serialize_check_of<Context, ValueType>;
 			using T = insert_value_t<ValueType>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/insert_value_list.h b/include/sqlpp11/insert_value_list.h
index b20efded..b893f641 100644
--- a/include/sqlpp11/insert_value_list.h
+++ b/include/sqlpp11/insert_value_list.h
@@ -425,6 +425,7 @@ namespace sqlpp
 	template<typename Context>
 		struct serializer_t<Context, insert_default_values_data_t>
 		{
+			using _serialize_check = consistent_t;
 			using T = insert_default_values_data_t;
 
 			static Context& _(const T& t, Context& context)
@@ -437,6 +438,7 @@ namespace sqlpp
 	template<typename Context, typename... Columns>
 		struct serializer_t<Context, column_list_data_t<Columns...>>
 		{
+			using _serialize_check = serialize_check_of<Context, Columns...>;
 			using T = column_list_data_t<Columns...>;
 
 			static Context& _(const T& t, Context& context)
@@ -464,6 +466,7 @@ namespace sqlpp
 	template<typename Context, typename Database, typename... Assignments>
 		struct serializer_t<Context, insert_list_data_t<Database, Assignments...>>
 		{
+			using _serialize_check = serialize_check_of<Context, Assignments...>;
 			using T = insert_list_data_t<Database, Assignments...>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/interpretable.h b/include/sqlpp11/interpretable.h
index d89075be..2e22ca9d 100644
--- a/include/sqlpp11/interpretable.h
+++ b/include/sqlpp11/interpretable.h
@@ -114,6 +114,7 @@ namespace sqlpp
 	template<typename Context, typename Database>
 		struct serializer_t<Context, interpretable_t<Database>>
 		{
+			using _serialize_check = consistent_t;
 			using T = interpretable_t<Database>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/into.h b/include/sqlpp11/into.h
index 71bb48cf..b4b86633 100644
--- a/include/sqlpp11/into.h
+++ b/include/sqlpp11/into.h
@@ -167,6 +167,7 @@ namespace sqlpp
 	template<typename Context, typename Database, typename Table>
 		struct serializer_t<Context, into_data_t<Database, Table>>
 		{
+			using _serialize_check = serialize_check_of<Context, Table>;
 			using T = into_data_t<Database, Table>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/is_null.h b/include/sqlpp11/is_null.h
index ecc06bd5..bca37cf0 100644
--- a/include/sqlpp11/is_null.h
+++ b/include/sqlpp11/is_null.h
@@ -69,6 +69,7 @@ namespace sqlpp
 	template<typename Context, bool NotInverted, typename Operand>
 		struct serializer_t<Context, is_null_t<NotInverted, Operand>>
 		{
+			using _serialize_check = serialize_check_of<Context, Operand>;
 			using T = is_null_t<NotInverted, Operand>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/join.h b/include/sqlpp11/join.h
index e7b444a7..f1097468 100644
--- a/include/sqlpp11/join.h
+++ b/include/sqlpp11/join.h
@@ -145,6 +145,7 @@ namespace sqlpp
 	template<typename Context, typename JoinType, typename Lhs, typename Rhs, typename On>
 		struct serializer_t<Context, join_t<JoinType, Lhs, Rhs, On>>
 		{
+			using _serialize_check = serialize_check_of<Context, Lhs, Rhs, On>;
 			using T = join_t<JoinType, Lhs, Rhs, On>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/like.h b/include/sqlpp11/like.h
index 2a73baa3..b5bb9101 100644
--- a/include/sqlpp11/like.h
+++ b/include/sqlpp11/like.h
@@ -71,6 +71,7 @@ namespace sqlpp
 	template<typename Context, typename Operand, typename Pattern>
 		struct serializer_t<Context, like_t<Operand, Pattern>>
 		{
+			using _serialize_check = serialize_check_of<Context, Operand, Pattern>;
 			using T = like_t<Operand, Pattern>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/limit.h b/include/sqlpp11/limit.h
index 49266fb8..5ada9791 100644
--- a/include/sqlpp11/limit.h
+++ b/include/sqlpp11/limit.h
@@ -231,6 +231,7 @@ namespace sqlpp
 	template<typename Context, typename Database>
 		struct serializer_t<Context, dynamic_limit_data_t<Database>>
 		{
+			using _serialize_check = consistent_t;
 			using T = dynamic_limit_data_t<Database>;
 
 			static Context& _(const T& t, Context& context)
@@ -247,6 +248,7 @@ namespace sqlpp
 	template<typename Context, typename Limit>
 		struct serializer_t<Context, limit_data_t<Limit>>
 		{
+			using _serialize_check = serialize_check_of<Context, Limit>;
 			using T = limit_data_t<Limit>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/max.h b/include/sqlpp11/max.h
index 440d1f31..251d6023 100644
--- a/include/sqlpp11/max.h
+++ b/include/sqlpp11/max.h
@@ -67,6 +67,7 @@ namespace sqlpp
 	template<typename Context, typename Expr>
 		struct serializer_t<Context, max_t<Expr>>
 		{
+			using _serialize_check = serialize_check_of<Context, Expr>;
 			using T = max_t<Expr>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/min.h b/include/sqlpp11/min.h
index e5387d37..04bb30cf 100644
--- a/include/sqlpp11/min.h
+++ b/include/sqlpp11/min.h
@@ -67,6 +67,7 @@ namespace sqlpp
 	template<typename Context, typename Expr>
 		struct serializer_t<Context, min_t<Expr>>
 		{
+			using _serialize_check = serialize_check_of<Context, Expr>;
 			using T = min_t<Expr>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/multi_column.h b/include/sqlpp11/multi_column.h
index 44288b83..dce7dce2 100644
--- a/include/sqlpp11/multi_column.h
+++ b/include/sqlpp11/multi_column.h
@@ -103,6 +103,7 @@ namespace sqlpp
 	template<typename Context, typename... Columns>
 		struct serializer_t<Context, multi_column_t<void, Columns...>>
 		{
+			using _serialize_check = serialize_check_of<Context, Columns...>;
 			using T = multi_column_t<void, Columns...>;
 
 			static void _(const T& t, Context& context)
@@ -114,6 +115,7 @@ namespace sqlpp
 	template<typename Context, typename AliasProvider, typename... Columns>
 		struct serializer_t<Context, multi_column_alias_t<AliasProvider, Columns...>>
 		{
+			using _serialize_check = serialize_check_of<Context, Columns...>;
 			using T = multi_column_alias_t<AliasProvider, Columns...>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/named_interpretable.h b/include/sqlpp11/named_interpretable.h
index 5ba0f044..3ec6c1ea 100644
--- a/include/sqlpp11/named_interpretable.h
+++ b/include/sqlpp11/named_interpretable.h
@@ -123,6 +123,7 @@ namespace sqlpp
 	template<typename Context, typename Database>
 		struct serializer_t<Context, named_interpretable_t<Database>>
 		{
+			using _serialize_check = consistent_t;
 			using T = named_interpretable_t<Database>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/no_data.h b/include/sqlpp11/no_data.h
index e94a9289..2c0952b4 100644
--- a/include/sqlpp11/no_data.h
+++ b/include/sqlpp11/no_data.h
@@ -37,6 +37,7 @@ namespace sqlpp
 	template<typename Context>
 		struct serializer_t<Context, no_data_t>
 		{
+			using _serialize_check = consistent_t;
 			using T = no_data_t;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/noop.h b/include/sqlpp11/noop.h
index d2341f1c..62f3b7db 100644
--- a/include/sqlpp11/noop.h
+++ b/include/sqlpp11/noop.h
@@ -84,6 +84,7 @@ namespace sqlpp
 	template<typename Context>
 		struct serializer_t<Context, noop>
 		{
+			using _serialize_check = consistent_t;
 			using T = noop;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/null.h b/include/sqlpp11/null.h
index 93e0706b..0432c387 100644
--- a/include/sqlpp11/null.h
+++ b/include/sqlpp11/null.h
@@ -40,6 +40,7 @@ namespace sqlpp
 	template<typename Context>
 		struct serializer_t<Context, null_t>
 		{
+			using _serialize_check = consistent_t;
 			using Operand = null_t;
 
 			static Context& _(const Operand& t, Context& context)
diff --git a/include/sqlpp11/offset.h b/include/sqlpp11/offset.h
index bc8d6769..4d0f7c1a 100644
--- a/include/sqlpp11/offset.h
+++ b/include/sqlpp11/offset.h
@@ -242,6 +242,7 @@ namespace sqlpp
 	template<typename Context, typename Offset>
 		struct serializer_t<Context, offset_data_t<Offset>>
 		{
+			using _serialize_check = serialize_check_of<Context, Offset>;
 			using T = offset_data_t<Offset>;
 
 			static Context& _(const T& t, Context& context)
@@ -255,6 +256,7 @@ namespace sqlpp
 	template<typename Context, typename Database>
 		struct serializer_t<Context, dynamic_offset_data_t<Database>>
 		{
+			using _serialize_check = consistent_t;
 			using T = dynamic_offset_data_t<Database>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/on.h b/include/sqlpp11/on.h
index 2a88eafb..8762d3c0 100644
--- a/include/sqlpp11/on.h
+++ b/include/sqlpp11/on.h
@@ -58,6 +58,7 @@ namespace sqlpp
 	template<typename Context, typename Database, typename... Expr>
 		struct serializer_t<Context, on_t<Database, Expr...>>
 		{
+			using _serialize_check = serialize_check_of<Context, Expr...>;
 			using T = on_t<Database, Expr...>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/order_by.h b/include/sqlpp11/order_by.h
index c27cf92b..12dc3a8a 100644
--- a/include/sqlpp11/order_by.h
+++ b/include/sqlpp11/order_by.h
@@ -195,6 +195,7 @@ namespace sqlpp
 	template<typename Context, typename Database, typename... Expressions>
 		struct serializer_t<Context, order_by_data_t<Database, Expressions...>>
 		{
+			using _serialize_check = serialize_check_of<Context, Expressions...>;
 			using T = order_by_data_t<Database, Expressions...>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/parameter.h b/include/sqlpp11/parameter.h
index 687096b3..b5daaabc 100644
--- a/include/sqlpp11/parameter.h
+++ b/include/sqlpp11/parameter.h
@@ -63,6 +63,7 @@ namespace sqlpp
 	template<typename Context, typename ValueType, typename NameType>
 		struct serializer_t<Context, parameter_t<ValueType, NameType>>
 		{
+			using _serialize_check = consistent_t;
 			using T = parameter_t<ValueType, NameType>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/prepared_execute.h b/include/sqlpp11/prepared_execute.h
index e9c27c9d..c328bbc1 100644
--- a/include/sqlpp11/prepared_execute.h
+++ b/include/sqlpp11/prepared_execute.h
@@ -29,12 +29,16 @@
 
 #include <sqlpp11/parameter_list.h>
 #include <sqlpp11/result.h>
+#include <sqlpp11/no_value.h>
 
 namespace sqlpp
 {
 	template<typename Db, typename Statement>
 		struct prepared_execute_t
 		{
+			using _traits = make_traits<no_value_t, tag::is_prepared_statement>;
+			using _recursive_traits = make_recursive_traits<>;
+
 			using _parameter_list_t = make_parameter_list_t<Statement>;
 			using _prepared_statement_t = typename Db::_prepared_statement_t;
 
diff --git a/include/sqlpp11/prepared_insert.h b/include/sqlpp11/prepared_insert.h
index 51c759fe..e81a56c0 100644
--- a/include/sqlpp11/prepared_insert.h
+++ b/include/sqlpp11/prepared_insert.h
@@ -29,12 +29,16 @@
 
 #include <sqlpp11/parameter_list.h>
 #include <sqlpp11/result.h>
+#include <sqlpp11/no_value.h>
 
 namespace sqlpp
 {
 	template<typename Db, typename Insert>
 		struct prepared_insert_t
 		{
+			using _traits = make_traits<no_value_t, tag::is_prepared_statement>;
+			using _recursive_traits = make_recursive_traits<>;
+
 			using _parameter_list_t = make_parameter_list_t<Insert>;
 			using _prepared_statement_t = typename Db::_prepared_statement_t;
 
diff --git a/include/sqlpp11/prepared_remove.h b/include/sqlpp11/prepared_remove.h
index 3203ee1b..d4a4dfad 100644
--- a/include/sqlpp11/prepared_remove.h
+++ b/include/sqlpp11/prepared_remove.h
@@ -29,12 +29,16 @@
 
 #include <sqlpp11/parameter_list.h>
 #include <sqlpp11/result.h>
+#include <sqlpp11/no_value.h>
 
 namespace sqlpp
 {
 	template<typename Db, typename Remove>
 		struct prepared_remove_t
 		{
+			using _traits = make_traits<no_value_t, tag::is_prepared_statement>;
+			using _recursive_traits = make_recursive_traits<>;
+
 			using _parameter_list_t = make_parameter_list_t<Remove>;
 			using _prepared_statement_t = typename Db::_prepared_statement_t;
 
diff --git a/include/sqlpp11/prepared_select.h b/include/sqlpp11/prepared_select.h
index 40553931..70665558 100644
--- a/include/sqlpp11/prepared_select.h
+++ b/include/sqlpp11/prepared_select.h
@@ -29,12 +29,16 @@
 
 #include <sqlpp11/parameter_list.h>
 #include <sqlpp11/result.h>
+#include <sqlpp11/no_value.h>
 
 namespace sqlpp
 {
 	template<typename Database, typename Statement, typename Composite = Statement>
 		struct prepared_select_t
 		{
+			using _traits = make_traits<no_value_t, tag::is_prepared_statement>;
+			using _recursive_traits = make_recursive_traits<>;
+
 			using _result_row_t = typename Statement::template _result_row_t<Database>;
 			using _parameter_list_t = make_parameter_list_t<Composite>;
 			using _dynamic_names_t = typename Statement::_dynamic_names_t;
diff --git a/include/sqlpp11/prepared_update.h b/include/sqlpp11/prepared_update.h
index b7f94b86..4bd54c85 100644
--- a/include/sqlpp11/prepared_update.h
+++ b/include/sqlpp11/prepared_update.h
@@ -29,12 +29,16 @@
 
 #include <sqlpp11/parameter_list.h>
 #include <sqlpp11/result.h>
+#include <sqlpp11/no_value.h>
 
 namespace sqlpp
 {
 	template<typename Db, typename Update>
 		struct prepared_update_t
 		{
+			using _traits = make_traits<no_value_t, tag::is_prepared_statement>;
+			using _recursive_traits = make_recursive_traits<>;
+
 			using _parameter_list_t = make_parameter_list_t<Update>;
 			using _prepared_statement_t = typename Db::_prepared_statement_t;
 
diff --git a/include/sqlpp11/remove.h b/include/sqlpp11/remove.h
index a74cc710..8d5f43be 100644
--- a/include/sqlpp11/remove.h
+++ b/include/sqlpp11/remove.h
@@ -91,6 +91,7 @@ namespace sqlpp
 	template<typename Context>
 		struct serializer_t<Context, remove_name_t>
 		{
+			using _serialize_check = consistent_t;
 			using T = remove_name_t;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/result_field.h b/include/sqlpp11/result_field.h
index 476ca3ea..9dbdb27a 100644
--- a/include/sqlpp11/result_field.h
+++ b/include/sqlpp11/result_field.h
@@ -41,6 +41,7 @@ namespace sqlpp
 	template<typename Context, typename ValueType, typename Db, typename FieldSpec>
 		struct serializer_t<Context, result_field_t<ValueType, Db, FieldSpec>>
 		{
+			using _serialize_check = consistent_t;
 			using T = result_field_t<ValueType, Db, FieldSpec>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/rhs_wrap.h b/include/sqlpp11/rhs_wrap.h
index c664d580..610ec634 100644
--- a/include/sqlpp11/rhs_wrap.h
+++ b/include/sqlpp11/rhs_wrap.h
@@ -147,6 +147,7 @@ namespace sqlpp
 	template<typename Context, typename Expr, bool TrivialValueIsNull>
 		struct serializer_t<Context, rhs_wrap_t<Expr, TrivialValueIsNull>>
 		{
+			using _serialize_check = serialize_check_of<Context, Expr>;
 			using T = rhs_wrap_t<Expr, TrivialValueIsNull>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/select.h b/include/sqlpp11/select.h
index 3a2556a5..1da653e0 100644
--- a/include/sqlpp11/select.h
+++ b/include/sqlpp11/select.h
@@ -49,12 +49,13 @@ namespace sqlpp
 {
 	struct select_name_t {};
 
-	struct select_t: public statement_name_t<select_name_t>
+	struct select_t: public statement_name_t<select_name_t, tag::is_select>
 	{};
 
 	template<typename Context>
 		struct serializer_t<Context, select_name_t>
 		{
+			using _serialize_check = consistent_t;
 			using T = select_name_t;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/select_column_list.h b/include/sqlpp11/select_column_list.h
index af247c7f..4688b3cb 100644
--- a/include/sqlpp11/select_column_list.h
+++ b/include/sqlpp11/select_column_list.h
@@ -411,6 +411,7 @@ namespace sqlpp
 	template<typename Context, typename Database, typename... Columns>
 		struct serializer_t<Context, select_column_list_data_t<Database, Columns...>>
 		{
+			using _serialize_check = serialize_check_of<Context, Columns...>;
 			using T = select_column_list_data_t<Database, Columns...>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/select_flag_list.h b/include/sqlpp11/select_flag_list.h
index afeaa9d4..faa41cdf 100644
--- a/include/sqlpp11/select_flag_list.h
+++ b/include/sqlpp11/select_flag_list.h
@@ -195,6 +195,7 @@ namespace sqlpp
 	template<typename Context, typename Database, typename... Flags>
 		struct serializer_t<Context, select_flag_list_data_t<Database, Flags...>>
 		{
+			using _serialize_check = serialize_check_of<Context, Flags...>;
 			using T = select_flag_list_data_t<Database, Flags...>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/select_flags.h b/include/sqlpp11/select_flags.h
index 002bd67a..580d66ab 100644
--- a/include/sqlpp11/select_flags.h
+++ b/include/sqlpp11/select_flags.h
@@ -45,6 +45,8 @@ namespace sqlpp
 	template<typename Context>
 		struct serializer_t<Context, all_t>
 		{
+			using _serialize_check = consistent_t;
+
 			static Context& _(const all_t&, Context& context)
 			{
 				context << "ALL";
@@ -62,6 +64,8 @@ namespace sqlpp
 	template<typename Context>
 		struct serializer_t<Context, distinct_t>
 		{
+			using _serialize_check = consistent_t;
+
 			static Context& _(const distinct_t&, Context& context)
 			{
 				context << "DISTINCT";
@@ -79,6 +83,8 @@ namespace sqlpp
 	template<typename Context>
 		struct serializer_t<Context, straight_join_t>
 		{
+			using _serialize_check = consistent_t;
+
 			static Context& _(const straight_join_t&, Context& context)
 			{
 				context << "STRAIGHT_JOIN";
diff --git a/include/sqlpp11/select_pseudo_table.h b/include/sqlpp11/select_pseudo_table.h
index 75f8dbf0..28429e5f 100644
--- a/include/sqlpp11/select_pseudo_table.h
+++ b/include/sqlpp11/select_pseudo_table.h
@@ -75,6 +75,7 @@ namespace sqlpp
 	template<typename Context, typename Select, typename... NamedExpr>
 		struct serializer_t<Context, select_pseudo_table_t<Select, NamedExpr...>>
 		{
+			using _serialize_check = serialize_check_of<Context, Select, NamedExpr...>;
 			using T = select_pseudo_table_t<Select, NamedExpr...>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/serialize.h b/include/sqlpp11/serialize.h
index e7331320..69e79fe5 100644
--- a/include/sqlpp11/serialize.h
+++ b/include/sqlpp11/serialize.h
@@ -37,16 +37,6 @@ namespace sqlpp
 		{
 			return serializer_t<Context, T>::_(t, context);
 		}
-
-	/*
-		 template<typename T, typename Context>
-		 auto serialize(const T& t, Context& context)
-		 -> decltype(serializer_t<Context, T>::_(t, context))
-		 {
-		 return serializer_t<Context, T>::_(t, context);
-		 }
-		 */
-
 }
 
 #endif
diff --git a/include/sqlpp11/serializer.h b/include/sqlpp11/serializer.h
index 04629bda..46261e0e 100644
--- a/include/sqlpp11/serializer.h
+++ b/include/sqlpp11/serializer.h
@@ -31,12 +31,26 @@
 
 namespace sqlpp
 {
+	template<typename Expression>
+	struct assert_serializer_specialization_t
+	{
+		using type = std::false_type;
+
+		template<typename T = void>
+		static void _()
+		{
+			static_assert(wrong_t<T>::value, "missing serializer specialization");
+		}
+	};
+
 	template<typename Context, typename T, typename Enable = void>
 		struct serializer_t
 		{
+			using _serialize_check = assert_serializer_specialization_t<T>;
+
 			static void _(const T& t, Context& context)
 			{
-				static_assert(wrong_t<serializer_t>::value, "missing serializer specialization");
+				_serialize_check::_();
 			}
 		};
 
diff --git a/include/sqlpp11/simple_column.h b/include/sqlpp11/simple_column.h
index dd1769c6..7bd0c02e 100644
--- a/include/sqlpp11/simple_column.h
+++ b/include/sqlpp11/simple_column.h
@@ -44,6 +44,7 @@ namespace sqlpp
 	template<typename Context, typename Column>
 		struct serializer_t<Context, simple_column_t<Column>>
 		{
+			using _serialize_check = serialize_check_of<Context, Column>;
 			using T = simple_column_t<Column>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/single_table.h b/include/sqlpp11/single_table.h
index f30a06c8..13b8bb20 100644
--- a/include/sqlpp11/single_table.h
+++ b/include/sqlpp11/single_table.h
@@ -155,6 +155,7 @@ namespace sqlpp
 	template<typename Context, typename Database, typename Table>
 		struct serializer_t<Context, single_table_data_t<Database, Table>>
 		{
+			using _serialize_check = serialize_check_of<Context, Table>;
 			using T = single_table_data_t<Database, Table>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/some.h b/include/sqlpp11/some.h
index 00dfb755..d457680d 100644
--- a/include/sqlpp11/some.h
+++ b/include/sqlpp11/some.h
@@ -66,6 +66,7 @@ namespace sqlpp
 	template<typename Context, typename Select>
 		struct serializer_t<Context, some_t<Select>>
 		{
+			using _serialize_check = serialize_check_of<Context, Select>;
 			using T = some_t<Select>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/sort_order.h b/include/sqlpp11/sort_order.h
index fbb1a1d8..edd15269 100644
--- a/include/sqlpp11/sort_order.h
+++ b/include/sqlpp11/sort_order.h
@@ -50,6 +50,7 @@ namespace sqlpp
 	template<typename Context, typename Expression, sort_type SortType>
 		struct serializer_t<Context, sort_order_t<Expression, SortType>>
 		{
+			using _serialize_check = serialize_check_of<Context, Expression>;
 			using T = sort_order_t<Expression, SortType>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/statement.h b/include/sqlpp11/statement.h
index 31738147..1a6adf64 100644
--- a/include/sqlpp11/statement.h
+++ b/include/sqlpp11/statement.h
@@ -173,7 +173,8 @@ namespace sqlpp
 			using _result_methods_t = typename _result_type_provider::template _result_methods_t<Composite>;
 
 		using _traits = make_traits<value_type_of<_policies_t>,
-					tag::is_select, 
+					tag::is_statement, 
+					tag_if<tag::is_select, detail::any_t<is_select_t<Policies>::value...>::value>,
 					tag_if<tag::is_expression, is_expression_t<_policies_t>::value>, 
 					tag_if<tag::is_selectable, is_expression_t<_policies_t>::value>,
 					tag_if<tag::is_return_value, detail::none_t<is_noop_t<_result_type_provider>::value>::value>,
@@ -236,8 +237,9 @@ namespace sqlpp
 	template<typename Context, typename Database, typename... Policies>
 		struct serializer_t<Context, statement_t<Database, Policies...>>
 		{
-			using T = statement_t<Database, Policies...>;
 			using P = detail::statement_policies_t<Database, Policies...>;
+			using _serialize_check = serialize_check_of<Context, typename Policies::template _member_t<P>::_data_t...>;
+			using T = statement_t<Database, Policies...>;
 
 			static Context& _(const T& t, Context& context)
 			{
@@ -248,10 +250,10 @@ namespace sqlpp
 			}
 		};
 
-	template<typename NameData>
+	template<typename NameData, typename Tag = tag::is_noop>
 		struct statement_name_t
 		{
-			using _traits = make_traits<no_value_t, tag::is_noop>;
+			using _traits = make_traits<no_value_t, Tag>;
 			using _recursive_traits = make_recursive_traits<>;
 
 			// Data
diff --git a/include/sqlpp11/sum.h b/include/sqlpp11/sum.h
index 6a5bf1be..004defe6 100644
--- a/include/sqlpp11/sum.h
+++ b/include/sqlpp11/sum.h
@@ -70,6 +70,7 @@ namespace sqlpp
 	template<typename Context, typename Flag, typename Expr>
 		struct serializer_t<Context, sum_t<Flag, Expr>>
 		{
+			using _serialize_check = serialize_check_of<Context, Flag, Expr>;
 			using T = sum_t<Flag, Expr>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/table.h b/include/sqlpp11/table.h
index a90605be..fd41315d 100644
--- a/include/sqlpp11/table.h
+++ b/include/sqlpp11/table.h
@@ -108,6 +108,7 @@ namespace sqlpp
 	template<typename Context, typename X>
 		struct serializer_t<Context, X, typename std::enable_if<std::is_base_of<table_base_t, X>::value and not is_pseudo_table_t<X>::value, void>::type>
 		{
+			using _serialize_check = consistent_t;
 			using T = X;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/table_alias.h b/include/sqlpp11/table_alias.h
index d35245be..2b77639b 100644
--- a/include/sqlpp11/table_alias.h
+++ b/include/sqlpp11/table_alias.h
@@ -67,6 +67,7 @@ namespace sqlpp
 	template<typename Context, typename AliasProvider, typename Table, typename... ColumnSpec>
 		struct serializer_t<Context, table_alias_t<AliasProvider, Table, ColumnSpec...>>
 		{
+			using _serialize_check = serialize_check_of<Context, Table>;
 			using T = table_alias_t<AliasProvider, Table, ColumnSpec...>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/text.h b/include/sqlpp11/text.h
index c42dea5d..9ae0c685 100644
--- a/include/sqlpp11/text.h
+++ b/include/sqlpp11/text.h
@@ -237,6 +237,7 @@ namespace sqlpp
 	template<typename Context, typename Db, typename FieldSpec>
 		struct serializer_t<Context, result_field_t<text, Db, FieldSpec>>
 		{
+			using _serialize_check = consistent_t;
 			using T = result_field_t<text, Db, FieldSpec>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/tvin.h b/include/sqlpp11/tvin.h
index fe289149..a9c7ba86 100644
--- a/include/sqlpp11/tvin.h
+++ b/include/sqlpp11/tvin.h
@@ -56,14 +56,26 @@ namespace sqlpp
 			_operand_t _value;
 		};
 
+	struct assert_tvin_with_correct_operator_t
+	{
+		using type = std::false_type;
+
+		template<typename T = void>
+		static void _()
+		{
+			static_assert(wrong_t<T>::value, "tvin may only be used with operators =, == and !=");
+		}
+	};
+
 	template<typename Context, typename Operand>
 		struct serializer_t<Context, tvin_arg_t<Operand>>
 		{
+			using _serialize_check = assert_tvin_with_correct_operator_t;
 			using T = tvin_arg_t<Operand>;
 
 			static Context& _(const T& t, Context& context)
 			{
-				static_assert(wrong_t<serializer_t>::value, "tvin may only be used with operators =, == and !=");
+				_serialize_check::_();
 			}
 		};
 
@@ -135,6 +147,7 @@ namespace sqlpp
 	template<typename Context, typename Operand>
 		struct serializer_t<Context, tvin_t<Operand>>
 		{
+			using _serialize_check = serialize_check_of<Context, Operand>;
 			using T = tvin_t<Operand>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/type_traits.h b/include/sqlpp11/type_traits.h
index d83b8ab1..90b0b417 100644
--- a/include/sqlpp11/type_traits.h
+++ b/include/sqlpp11/type_traits.h
@@ -29,7 +29,9 @@
 
 #include <type_traits>
 #include <tuple>
+#include <sqlpp11/serializer.h>
 #include <sqlpp11/detail/type_set.h>
+#include <sqlpp11/detail/get_first.h>
 
 namespace sqlpp
 {
@@ -124,6 +126,8 @@ namespace sqlpp
 	SQLPP_VALUE_TRAIT_GENERATOR(trivial_value_is_null);
 	SQLPP_VALUE_TRAIT_GENERATOR(null_is_trivial_value);
 
+	SQLPP_VALUE_TRAIT_GENERATOR(is_statement);
+	SQLPP_VALUE_TRAIT_GENERATOR(is_prepared_statement);
 	SQLPP_VALUE_TRAIT_GENERATOR(is_noop);
 	SQLPP_VALUE_TRAIT_GENERATOR(is_missing);
 	SQLPP_VALUE_TRAIT_GENERATOR(is_return_value);
@@ -249,6 +253,52 @@ namespace sqlpp
 
 	template<typename T>
 	using is_inconsistent_t = typename std::conditional<std::is_same<consistent_t, T>::value, std::false_type, std::true_type>::type;
+
+	template<typename Context, typename... T>
+	using serialize_check_of = detail::get_first_if<is_inconsistent_t, consistent_t, typename serializer_t<Context, T>::_serialize_check...>;
+
+	struct assert_statement_or_prepared_t
+	{
+		using type = std::false_type;
+
+		template<typename T = void>
+			static void _()
+			{
+				static_assert(wrong_t<T>::value, "connection cannot run something that is neither statement nor prepared statement");
+			};
+	};
+
+	template<typename T, typename Enable = void>
+		struct run_check
+		{
+			using type = assert_statement_or_prepared_t;
+		};
+
+	template<typename T>
+		struct run_check<T, typename std::enable_if<is_statement_t<T>::value or is_prepared_statement_t<T>::value>::type>
+		{
+			using type = typename T::_run_check;
+		};
+
+	template<typename T>
+		using run_check_t = typename run_check<T>::type;
+
+
+	template<typename Context, typename T, typename Enable = void>
+		struct serialize_check
+		{
+			using type = serialize_check_of<Context, T>;
+		};
+
+	template<typename Context, typename T>
+		struct serialize_check<Context, T, typename std::enable_if<is_prepared_statement_t<T>::value>::type>
+		{
+			using type = consistent_t; // this is already serialized
+		};
+
+	template<typename Context, typename T>
+		using serialize_check_t = typename serialize_check<Context, T>::type;
+
 }
 
 #endif
diff --git a/include/sqlpp11/update.h b/include/sqlpp11/update.h
index 49f4ee85..09ee8a5d 100644
--- a/include/sqlpp11/update.h
+++ b/include/sqlpp11/update.h
@@ -91,6 +91,7 @@ namespace sqlpp
 	template<typename Context>
 		struct serializer_t<Context, update_name_t>
 		{
+			using _serialize_check = consistent_t;
 			using T = update_name_t;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/update_list.h b/include/sqlpp11/update_list.h
index 2b2edcd3..f3e45257 100644
--- a/include/sqlpp11/update_list.h
+++ b/include/sqlpp11/update_list.h
@@ -217,6 +217,7 @@ namespace sqlpp
 	template<typename Context, typename Database, typename... Assignments>
 		struct serializer_t<Context, update_list_data_t<Database, Assignments...>>
 		{
+			using _serialize_check = serialize_check_of<Context, Assignments...>;
 			using T = update_list_data_t<Database, Assignments...>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/using.h b/include/sqlpp11/using.h
index 1c67cfa6..d6fb872b 100644
--- a/include/sqlpp11/using.h
+++ b/include/sqlpp11/using.h
@@ -188,6 +188,7 @@ namespace sqlpp
 	template<typename Context, typename Database, typename... Tables>
 		struct serializer_t<Context, using_data_t<Database, Tables...>>
 		{
+			using _serialize_check = serialize_check_of<Context, Tables...>;
 			using T = using_data_t<Database, Tables...>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/verbatim.h b/include/sqlpp11/verbatim.h
index d03ea4af..48aa73de 100644
--- a/include/sqlpp11/verbatim.h
+++ b/include/sqlpp11/verbatim.h
@@ -57,6 +57,7 @@ namespace sqlpp
 	template<typename Context, typename ValueType>
 		struct serializer_t<Context, verbatim_t<ValueType>>
 		{
+			using _serialize_check = consistent_t;
 			using T = verbatim_t<ValueType>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/verbatim_table.h b/include/sqlpp11/verbatim_table.h
index fc53af7f..a58a7e56 100644
--- a/include/sqlpp11/verbatim_table.h
+++ b/include/sqlpp11/verbatim_table.h
@@ -72,6 +72,7 @@ namespace sqlpp
 	template<typename Context>
 		struct serializer_t<Context, verbatim_table_t>
 		{
+			using _serialize_check = consistent_t;
 			using T = verbatim_table_t;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/where.h b/include/sqlpp11/where.h
index a1de9edc..70217c17 100644
--- a/include/sqlpp11/where.h
+++ b/include/sqlpp11/where.h
@@ -261,6 +261,7 @@ namespace sqlpp
 	template<typename Context, typename Database, typename... Expressions>
 		struct serializer_t<Context, where_data_t<Database, Expressions...>>
 		{
+			using _serialize_check = serialize_check_of<Context, Expressions...>;
 			using T = where_data_t<Database, Expressions...>;
 
 			static Context& _(const T& t, Context& context)
@@ -279,6 +280,7 @@ namespace sqlpp
 	template<typename Context>
 		struct serializer_t<Context, where_data_t<void, bool>>
 		{
+			using _serialize_check = consistent_t;
 			using T = where_data_t<void, bool>;
 
 			static Context& _(const T& t, Context& context)
diff --git a/include/sqlpp11/wrap_operand.h b/include/sqlpp11/wrap_operand.h
index 7be274c2..04e0100c 100644
--- a/include/sqlpp11/wrap_operand.h
+++ b/include/sqlpp11/wrap_operand.h
@@ -69,6 +69,7 @@ namespace sqlpp
 	template<typename Context>
 		struct serializer_t<Context, boolean_operand>
 		{
+			using _serialize_check = consistent_t;
 			using Operand = boolean_operand;
 
 			static Context& _(const Operand& t, Context& context)
@@ -107,6 +108,7 @@ namespace sqlpp
 	template<typename Context>
 		struct serializer_t<Context, integral_operand>
 		{
+			using _serialize_check = consistent_t;
 			using Operand = integral_operand;
 
 			static Context& _(const Operand& t, Context& context)
@@ -146,6 +148,7 @@ namespace sqlpp
 	template<typename Context>
 		struct serializer_t<Context, floating_point_operand>
 		{
+			using _serialize_check = consistent_t;
 			using Operand = floating_point_operand;
 
 			static Context& _(const Operand& t, Context& context)
@@ -184,6 +187,7 @@ namespace sqlpp
 	template<typename Context>
 		struct serializer_t<Context, text_operand>
 		{
+			using _serialize_check = consistent_t;
 			using Operand = text_operand;
 
 			static Context& _(const Operand& t, Context& context)
diff --git a/tests/MockDb.h b/tests/MockDb.h
index cba48a83..540af0a2 100644
--- a/tests/MockDb.h
+++ b/tests/MockDb.h
@@ -118,8 +118,10 @@ struct MockDbT: public sqlpp::connection
 	template<typename T>
 		auto operator() (const T& t) -> decltype(t._run(*this))
 		{
-			T::_run_check::_();
-			using _ok = typename T::_run_check::type;
+			sqlpp::run_check_t<T>::_();
+			sqlpp::serialize_check_t<_serializer_context_t, T>::_();
+			using _ok = sqlpp::detail::all_t<sqlpp::run_check_t<T>::type::value,
+				  sqlpp::serialize_check_t<_serializer_context_t, T>::type::value>;
 			return _run(t, _ok{});
 		}