3party/sqlpp11
0
0
Fork 0
mirror of https://github.com/rbock/sqlpp11.git synced 2024-11-15 20:31:16 +08:00
Code Issues Projects Releases Wiki Activity

All tests compile again for clang-3.2

Browse Source
This commit is contained in:
rbock 2014-06-14 17:57:12 +02:00
parent 3d26f9a686
commit 4ce8f2419b
7 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sqlpp11/interpretable.h
View File

@ -82,7 +82,7 @@ namespace sqlpp
template<typename T> template<typename T>
struct _impl_t: public _impl_base struct _impl_t: public _impl_base
{ {
static_assert(not make_parameter_list_t<T>::type::size::value, "parameters not supported in dynamic statement parts"); static_assert(not make_parameter_list_t<T>::size::value, "parameters not supported in dynamic statement parts");
_impl_t(T t): _impl_t(T t):
_t(t) _t(t)
{} {}

1
include/sqlpp11/into.h
View File

@ -29,6 +29,7 @@
#include <sqlpp11/type_traits.h> #include <sqlpp11/type_traits.h>
#include <sqlpp11/no_value.h> #include <sqlpp11/no_value.h>
#include <sqlpp11/prepared_insert.h>
#include <sqlpp11/serializer.h> #include <sqlpp11/serializer.h>
#include <sqlpp11/detail/type_set.h> #include <sqlpp11/detail/type_set.h>

2
include/sqlpp11/named_interpretable.h
View File

@ -86,7 +86,7 @@ namespace sqlpp
template<typename T> template<typename T>
struct _impl_t: public _impl_base struct _impl_t: public _impl_base
{ {
static_assert(not make_parameter_list_t<T>::type::size::value, "parameters not supported in dynamic statement parts"); static_assert(not make_parameter_list_t<T>::size::value, "parameters not supported in dynamic statement parts");
_impl_t(T t): _impl_t(T t):
_t(t) _t(t)
{} {}

2
include/sqlpp11/remove.h
View File

@ -69,7 +69,7 @@ namespace sqlpp
auto _prepare(Db& db) const auto _prepare(Db& db) const
-> prepared_remove_t<Db, _statement_t> -> prepared_remove_t<Db, _statement_t>
{ {
_check_consistency(); _statement_t::_check_consistency();
return {{}, db.prepare_remove(*this)}; return {{}, db.prepare_remove(*this)};
} }

5
include/sqlpp11/simple_column.h
View File

@ -28,6 +28,7 @@
#define SQLPP_SIMPLE_COLUMN_H #define SQLPP_SIMPLE_COLUMN_H
#include <sqlpp11/serializer.h> #include <sqlpp11/serializer.h>
#include <sqlpp11/type_traits.h>
namespace sqlpp namespace sqlpp
{ {
@ -35,6 +36,9 @@ namespace sqlpp
struct simple_column_t struct simple_column_t
{ {
Column _column; Column _column;
using _traits = make_traits<no_value_t, ::sqlpp::tag::noop>;
using _recursive_traits = make_recursive_traits<>;
}; };
template<typename Context, typename Column> template<typename Context, typename Column>
@ -52,6 +56,7 @@ namespace sqlpp
template<typename Column> template<typename Column>
simple_column_t<Column> simple_column(Column c) simple_column_t<Column> simple_column(Column c)
{ {
#warning: make sure that there are no parameters in Column
return {c}; return {c};
} }
} }

1
include/sqlpp11/single_table.h
View File

@ -30,6 +30,7 @@
#include <sqlpp11/type_traits.h> #include <sqlpp11/type_traits.h>
#include <sqlpp11/no_value.h> #include <sqlpp11/no_value.h>
#include <sqlpp11/serializer.h> #include <sqlpp11/serializer.h>
#include <sqlpp11/prepared_insert.h>
#include <sqlpp11/detail/type_set.h> #include <sqlpp11/detail/type_set.h>
namespace sqlpp namespace sqlpp

14
tests/CMakeLists.txt
View File

@ -6,13 +6,13 @@ macro (build_and_run arg)
add_test(${arg} ${arg}) add_test(${arg} ${arg})
endmacro () endmacro ()
#build_and_run(InterpretTest) build_and_run(InterpretTest)
#build_and_run(InsertTest) build_and_run(InsertTest)
#build_and_run(RemoveTest) build_and_run(RemoveTest)
#build_and_run(UpdateTest) build_and_run(UpdateTest)
#build_and_run(SelectTest) build_and_run(SelectTest)
#build_and_run(SelectTypeTest) build_and_run(SelectTypeTest)
#build_and_run(FunctionTest) build_and_run(FunctionTest)
build_and_run(PreparedTest) build_and_run(PreparedTest)
find_package(PythonInterp REQUIRED) find_package(PythonInterp REQUIRED)