diff --git a/include/sqlpp11/interpretable.h b/include/sqlpp11/interpretable.h index 28a2413b..c93bcaea 100644 --- a/include/sqlpp11/interpretable.h +++ b/include/sqlpp11/interpretable.h @@ -82,7 +82,7 @@ namespace sqlpp template struct _impl_t: public _impl_base { - static_assert(not make_parameter_list_t::type::size::value, "parameters not supported in dynamic statement parts"); + static_assert(not make_parameter_list_t::size::value, "parameters not supported in dynamic statement parts"); _impl_t(T t): _t(t) {} diff --git a/include/sqlpp11/into.h b/include/sqlpp11/into.h index fe07b073..fd2a08e4 100644 --- a/include/sqlpp11/into.h +++ b/include/sqlpp11/into.h @@ -29,6 +29,7 @@ #include #include +#include #include #include diff --git a/include/sqlpp11/named_interpretable.h b/include/sqlpp11/named_interpretable.h index 4aa93fa2..78af6e8c 100644 --- a/include/sqlpp11/named_interpretable.h +++ b/include/sqlpp11/named_interpretable.h @@ -86,7 +86,7 @@ namespace sqlpp template struct _impl_t: public _impl_base { - static_assert(not make_parameter_list_t::type::size::value, "parameters not supported in dynamic statement parts"); + static_assert(not make_parameter_list_t::size::value, "parameters not supported in dynamic statement parts"); _impl_t(T t): _t(t) {} diff --git a/include/sqlpp11/remove.h b/include/sqlpp11/remove.h index c0abe94e..38a686b8 100644 --- a/include/sqlpp11/remove.h +++ b/include/sqlpp11/remove.h @@ -69,7 +69,7 @@ namespace sqlpp auto _prepare(Db& db) const -> prepared_remove_t { - _check_consistency(); + _statement_t::_check_consistency(); return {{}, db.prepare_remove(*this)}; } diff --git a/include/sqlpp11/simple_column.h b/include/sqlpp11/simple_column.h index 34f030e3..0f05befe 100644 --- a/include/sqlpp11/simple_column.h +++ b/include/sqlpp11/simple_column.h @@ -28,6 +28,7 @@ #define SQLPP_SIMPLE_COLUMN_H #include +#include namespace sqlpp { @@ -35,6 +36,9 @@ namespace sqlpp struct simple_column_t { Column _column; + + using _traits = make_traits; + using _recursive_traits = make_recursive_traits<>; }; template @@ -52,6 +56,7 @@ namespace sqlpp template simple_column_t simple_column(Column c) { +#warning: make sure that there are no parameters in Column return {c}; } } diff --git a/include/sqlpp11/single_table.h b/include/sqlpp11/single_table.h index a51b94e4..31d667e2 100644 --- a/include/sqlpp11/single_table.h +++ b/include/sqlpp11/single_table.h @@ -30,6 +30,7 @@ #include #include #include +#include #include namespace sqlpp diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 0368c2b3..350602ec 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -6,13 +6,13 @@ macro (build_and_run arg) add_test(${arg} ${arg}) endmacro () -#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(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) find_package(PythonInterp REQUIRED)