diff --git a/include/sqlpp11/extra_tables.h b/include/sqlpp11/extra_tables.h index 4b25a04f..82b54fd7 100644 --- a/include/sqlpp11/extra_tables.h +++ b/include/sqlpp11/extra_tables.h @@ -60,8 +60,6 @@ namespace sqlpp using _extra_tables = ::sqlpp::detail::type_set; }; - using _recursive_traits = make_recursive_traits; - // FIXME: extra_tables must not require tables! static_assert(sizeof...(Tables), "at least one table or join argument required in extra_tables()"); diff --git a/include/sqlpp11/insert.h b/include/sqlpp11/insert.h index d1f82eb2..b6ca7ff2 100644 --- a/include/sqlpp11/insert.h +++ b/include/sqlpp11/insert.h @@ -56,7 +56,7 @@ namespace sqlpp } template - auto _run(Db& db) const -> decltype(db.insert(_get_statement())) + auto _run(Db& db) const -> decltype(db.insert(this->_get_statement())) { _statement_t::_check_consistency(); diff --git a/include/sqlpp11/into.h b/include/sqlpp11/into.h index 2454528a..de2e2214 100644 --- a/include/sqlpp11/into.h +++ b/include/sqlpp11/into.h @@ -108,7 +108,7 @@ namespace sqlpp } template - auto _run(Db& db) const -> decltype(db.insert(_get_statement())) + auto _run(Db& db) const -> decltype(db.insert(this->_get_statement())) { _statement_t::_check_consistency(); diff --git a/include/sqlpp11/remove.h b/include/sqlpp11/remove.h index d3bc1142..1c067f09 100644 --- a/include/sqlpp11/remove.h +++ b/include/sqlpp11/remove.h @@ -57,7 +57,7 @@ namespace sqlpp } template - auto _run(Db& db) const -> decltype(db.remove(_get_statement())) + auto _run(Db& db) const -> decltype(db.remove(this->_get_statement())) { _statement_t::_check_consistency(); diff --git a/include/sqlpp11/select_column_list.h b/include/sqlpp11/select_column_list.h index 602bcf3f..41cb5f06 100644 --- a/include/sqlpp11/select_column_list.h +++ b/include/sqlpp11/select_column_list.h @@ -284,7 +284,7 @@ namespace sqlpp // Execute template auto _run(Db& db) const - -> result_t> + -> result_t_get_statement())), _result_row_t> { _statement_t::_check_consistency(); static_assert(_statement_t::_get_static_no_of_parameters() == 0, "cannot run select directly with parameters, use prepare instead"); diff --git a/include/sqlpp11/statement.h b/include/sqlpp11/statement.h index b5e1bc5a..ea40ee3b 100644 --- a/include/sqlpp11/statement.h +++ b/include/sqlpp11/statement.h @@ -110,7 +110,7 @@ namespace sqlpp struct _recursive_traits { - using _required_tables = _required_tables; + using _required_tables = statement_policies_t::_required_tables; using _provided_tables = detail::type_set<>; using _extra_tables = detail::type_set<>; using _parameters = detail::make_parameter_tuple_t...>; diff --git a/include/sqlpp11/update.h b/include/sqlpp11/update.h index 58bb2b74..f6ddd15b 100644 --- a/include/sqlpp11/update.h +++ b/include/sqlpp11/update.h @@ -57,7 +57,7 @@ namespace sqlpp } template - auto _run(Db& db) const -> decltype(db.update(_get_statement())) + auto _run(Db& db) const -> decltype(db.update(this->_get_statement())) { _statement_t::_check_consistency();