Merge branch 'release/0.37'

This commit is contained in:
rbock
2016-04-17 17:33:27 +02:00
3 changed files with 12 additions and 1 deletions

View File

@@ -52,6 +52,11 @@ namespace sqlpp
{
return _dynamic_columns.empty();
}
auto size() -> size_t
{
return _dynamic_columns.size();
}
};
template <>
@@ -64,6 +69,11 @@ namespace sqlpp
{
return true;
}
static constexpr auto size() -> size_t
{
return {};
}
};
template <typename Context, typename Db>

View File

@@ -39,6 +39,7 @@
#include <sqlpp11/simple_column.h>
#include <sqlpp11/no_data.h>
#include <sqlpp11/policy_update.h>
#include <sqlpp11/statement.h>
namespace sqlpp
{

View File

@@ -264,7 +264,7 @@ namespace sqlpp
size_t get_no_of_result_columns() const
{
return sizeof...(Columns) + get_dynamic_names().size();
return sizeof...(Columns) + _get_statement().get_selected_columns()._data._dynamic_columns.size();
}
// Execute