mirror/sqlpp11
1
0
Fork 0
mirror of https://github.com/rbock/sqlpp11.git synced 2026-05-09 04:39:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added first test

Browse Source
This commit is contained in:
rbock
2014-10-29 07:34:42 +01:00
parent 69337fd7ca
commit 6684ac9ea8
4 changed files with 81 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sqlpp11/custom_query.h
+10 -10
View File
@@ -31,12 +31,12 @@
namespace sqlpp
{
template<typename Database, typename FirstPart, typename... Parts>
struct custom_query_t:
public FirstPart::_result_type_provider::template _result_methods_t<custom_query_t>
template<typename Database, typename... Parts>
struct custom_query_t/*:
public FirstPart::_result_type_provider::template _result_methods_t<custom_query_t>*/
{
custom_query_t(Expressions... expressions):
_expressions(expressions...)
custom_query_t(Parts... parts):
_parts(parts...)
{}
custom_query_t(const custom_query_t&) = default;
@@ -45,7 +45,7 @@ namespace sqlpp
custom_query_t& operator=(custom_query_t&&) = default;
~custom_query_t() = default;
std::tuple<FirstPart, Parts...> _parts;
std::tuple<Parts...> _parts;
};
template<typename Context, typename Database, typename... Parts>
@@ -55,21 +55,21 @@ namespace sqlpp
static Context& _(const T& t, Context& context)
{
interpret_tuple(t._parts, " ", context);
interpret_tuple_without_braces(t._parts, " ", context);
return context;
}
};
template<typename... Parts>
auto custom_query(Parts... parts)
-> statement_t<void, Parts...>
-> custom_query_t<void, Parts...>
{
return statement_t<void, Parts>(parts...);
return custom_query_t<void, Parts...>(parts...);
}
template<typename Database, typename... Parts>
auto dynamic_custom_query(const Database&, Parts...)
-> statement_t<Database, Parts...>
-> custom_query_t<Database, Parts...>
{
static_assert(std::is_base_of<connection, Database>::value, "Invalid database parameter");
return { };
include/sqlpp11/interpret_tuple.h
+15 -8
View File
@@ -34,20 +34,20 @@
namespace sqlpp
{
template<typename Element, typename Separator, typename Context>
static void interpret_tuple_element(const Element& element, const Separator& separator, Context& context, size_t index)
template<typename Element, typename Separator, typename Context, typename UseBraces>
static void interpret_tuple_element(const Element& element, const Separator& separator, Context& context, const UseBraces&, size_t index)
{
if (index)
context << separator;
if (requires_braces_t<Element>::value)
if (UseBraces::value and requires_braces_t<Element>::value)
context << "(";
serialize(element, context);
if (requires_braces_t<Element>::value)
if (UseBraces::value and requires_braces_t<Element>::value)
context << ")";
}
template<typename Tuple, typename Separator, typename Context, size_t... Is>
auto interpret_tuple_impl(const Tuple& t, const Separator& separator, Context& context, const detail::index_sequence<Is...>&)
template<typename Tuple, typename Separator, typename Context, typename UseBraces, size_t... Is>
auto interpret_tuple_impl(const Tuple& t, const Separator& separator, Context& context, const UseBraces& useBraces, const detail::index_sequence<Is...>&)
-> Context&
{
// Note: A braced-init-list does guarantee the order of evaluation according to 12.6.1 [class.explicit.init] paragraph 2 and 8.5.4 [dcl.init.list] paragraph 4.
@@ -55,7 +55,7 @@ namespace sqlpp
// See also: "http://stackoverflow.com/questions/6245735/pretty-print-stdtuple/6245777#6245777"
// Beware of gcc-bug: "http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51253", otherwise an empty swallow struct could be used
using swallow = int[];
(void) swallow{(interpret_tuple_element(std::get<Is>(t), separator, context, Is), 0)...};
(void) swallow{(interpret_tuple_element(std::get<Is>(t), separator, context, useBraces, Is), 0)...};
return context;
}
@@ -63,7 +63,14 @@ namespace sqlpp
auto interpret_tuple(const Tuple& t, const Separator& separator, Context& context)
-> Context&
{
return interpret_tuple_impl(t, separator, context, detail::make_index_sequence<std::tuple_size<Tuple>::value>{});
return interpret_tuple_impl(t, separator, context, std::true_type{}, detail::make_index_sequence<std::tuple_size<Tuple>::value>{});
}
template<typename Tuple, typename Separator, typename Context>
auto interpret_tuple_without_braces(const Tuple& t, const Separator& separator, Context& context)
-> Context&
{
return interpret_tuple_impl(t, separator, context, std::false_type{}, detail::make_index_sequence<std::tuple_size<Tuple>::value>{});
}
}
tests/CMakeLists.txt
+12 -11
View File
@@ -6,17 +6,18 @@ 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)
build_and_run(UpdateTest)
build_and_run(SelectTest)
build_and_run(SelectTypeTest)
build_and_run(FunctionTest)
build_and_run(PreparedTest)
build_and_run(Minimalistic)
build_and_run(ResultTest)
#build_and_run(BooleanExpressionTest)
build_and_run(CustomQueryTest)
#build_and_run(InterpretTest)
#build_and_run(InsertTest)
#build_and_run(RemoveTest)
#build_and_run(UpdateTest)
#build_and_run(SelectTest)
#build_and_run(SelectTypeTest)
#build_and_run(FunctionTest)
#build_and_run(PreparedTest)
#build_and_run(Minimalistic)
#build_and_run(ResultTest)
# if you want to use the generator, you can do something like this:
#find_package(PythonInterp REQUIRED)
tests/CustomQueryTest.cpp
+44
View File
@@ -0,0 +1,44 @@
/*
* 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>
#include <sqlpp11/custom_query.h>
MockDb db = {};
MockDb::_serializer_context_t printer;
int main()
{
test::TabFoo f;
test::TabBar t;
auto c = custom_query(select(all_of(t)).from(t), insert_into(t));
std::cerr << serialize(c, printer).str() << std::endl;
return 0;
}