Added generic boolean_expression

include/sqlpp11/boolean_expression.h

@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2013-2014, Roland Bock
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ * 
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * 
+ *   Redistributions in binary form must reproduce the above copyright notice, this
+ *   list of conditions and the following disclaimer in the documentation and/or
+ *   other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SQLPP_BOOLEAN_EXPRESSION_H
+#define SQLPP_BOOLEAN_EXPRESSION_H
+
+#include <sqlpp11/type_traits.h>
+#include <sqlpp11/interpretable.h>
+
+namespace sqlpp
+{
+	template<typename Database>
+		struct boolean_expression_t
+		{
+			using _traits = make_traits<boolean, tag::is_expression>;
+			using _recursive_traits = make_recursive_traits<>;
+
+			template<typename Expression>
+			boolean_expression_t(Expression expression):
+				_expression(expression)
+			{
+				static_assert(is_expression_t<Expression>::value, "boolean_expression requires a boolean expression argument");
+				static_assert(is_boolean_t<Expression>::value, "boolean_expression requires a boolean expression argument");
+			}
+
+			boolean_expression_t(const boolean_expression_t&) = default;
+			boolean_expression_t(boolean_expression_t&&) = default;
+			boolean_expression_t& operator=(const boolean_expression_t&) = default;
+			boolean_expression_t& operator=(boolean_expression_t&&) = default;
+			~boolean_expression_t() = default;
+
+			interpretable_t<Database> _expression;
+		};
+
+	template<typename Database, typename T>
+		boolean_expression_t<Database> boolean_expression(const Database&, T t)
+		{
+			return {t};
+		}
+
+	template<typename Database, typename T>
+		boolean_expression_t<Database> boolean_expression(T t)
+		{
+			return {t};
+		}
+
+	template<typename Context, typename Database>
+		struct serializer_t<Context, boolean_expression_t<Database>>
+		{
+			using T = boolean_expression_t<Database>;
+
+			static Context& _(const T& t, Context& context)
+			{
+				return serialize(t._expression);
+			}
+		};
+
+}
+
+#endif

include/sqlpp11/functions.h

@@ -46,7 +46,6 @@
 
 namespace sqlpp
 {
-#warning add a template<typename Db> bool_expression which takes any bool expression as constructor argument
 	template<typename T>
 		auto value(T t) -> wrap_operand_t<T>
 		{

include/sqlpp11/sqlpp11.h

@@ -35,6 +35,7 @@
 #include <sqlpp11/select.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/transaction.h>
+#include <sqlpp11/boolean_expression.h>
 
 #endif
 

tests/BooleanExpressionTest.cpp

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2013-2014, Roland Bock
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ * 
+ *  * Redistributions of source code must retain the above copyright notice, 
+ *    this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright notice, 
+ *    this list of conditions and the following disclaimer in the documentation 
+ *    and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <iostream>
+#include "Sample.h"
+#include "MockDb.h"
+#include <sqlpp11/sqlpp11.h>
+
+MockDb db = {};
+
+int main()
+{
+	test::TabBar t; 
+
+	auto x = boolean_expression(db, t.alpha == 7);
+	x = boolean_expression(db, t.gamma);
+	x = sqlpp::boolean_expression<MockDb>(t.beta.like("%cheesecake"));
+
+	return 0;
+}

tests/CMakeLists.txt

@@ -6,6 +6,7 @@ macro (build_and_run arg)
 	add_test(${arg} ${arg})
 endmacro ()
 
+build_and_run(BooleanExpressionTest)
 build_and_run(InterpretTest)
 build_and_run(InsertTest)
 build_and_run(RemoveTest)