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

add iterator_category field to result_t::iterator

Browse Source 
default value is std::input_iterator_tag, connections should specialize
the sqlpp11::iterator_category struct defined in result.h to override
that value
This commit is contained in:
Théo DELRIEU 2017-03-01 19:09:21 +01:00
parent a55ba76c3b
commit d50c65996a
No known key found for this signature in database
GPG Key ID: C64D5E244E08ADC6
2 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/sqlpp11/result.h
View File

@ -27,9 +27,17 @@
#ifndef SQLPP_RESULT_H
#define SQLPP_RESULT_H
// FIXME: include for move?
#include <iterator>
#include <utility>
namespace sqlpp
{
template <typename>
struct iterator_category
{
using type = std::input_iterator_tag;
};
template <typename DbResult, typename ResultRow>
class result_t
{
@ -60,16 +68,22 @@ namespace sqlpp
class iterator
{
public:
using iterator_category = typename iterator_category<DbResult>::type;
using value_type = result_row_t;
using pointer = const result_row_t*;
using reference = const result_row_t&;
using difference_type = std::ptrdiff_t;
iterator(db_result_t& result, result_row_t& result_row) : _result(result), _result_row(result_row)
{
}
const result_row_t& operator*() const
reference operator*() const
{
return _result_row;
}
const result_row_t* operator->() const
pointer operator->() const
{
return &_result_row;
}
@ -84,9 +98,17 @@ namespace sqlpp
return not(operator==(rhs));
}
void operator++()
iterator& operator++()
{
_result.next(_result_row);
return *this;
}
iterator operator++(int)
{
auto previous_it = *this;
_result.next(_result_row);
return previous_it;
}
db_result_t& _result;

16
tests/Select.cpp
View File

@ -26,6 +26,7 @@
#include "MockDb.h"
#include "Sample.h"
#include "is_regular.h"
#include <algorithm>
#include <iostream>
#include <sqlpp11/alias_provider.h>
#include <sqlpp11/connection.h>
@ -52,6 +53,14 @@ struct to_cerr
}
};
template <typename Row>
void print_row(Row const& row)
{
int64_t a = row.alpha;
const std::string b = row.beta;
std::cout << a << ", " << b << std::endl;
}
int Select(int, char* [])
{
MockDb db = {};
@ -69,6 +78,13 @@ int Select(int, char* [])
std::cout << row.a << std::endl;
}
{
// using stl algorithms
auto rows = db(select(all_of(t)).from(t).unconditionally());
// nicer in C++14
std::for_each(rows.begin(), rows.end(), &print_row<decltype(*rows.begin())>);
}
for (const auto& row : db(select(all_of(t)).from(t).unconditionally()))
{
int64_t a = row.alpha;