/sqlite3cc

To get this branch, use:
bzr branch http://bzr.ed.am/sqlite3cc

« back to all changes in this revision

Viewing changes to src/query.cc

  • Committer: edam
  • Date: 2010-07-29 09:16:26 UTC
  • Revision ID: edam@waxworlds.org-20100729091626-h8fmg0r74eyfo5ae
- fixed error caused by finialising in-progress queries during rollback that were later finaliased by RAII.

Show diffs side-by-side

added added

removed removed

src/query.cc
22
22
 
23
23
#include <sqlite3cc/query.h>
24
24
#include <sqlite3cc/row.h>
25
 
#include <sqlite3cc/connection.h>
 
25
#include <sqlite3cc/database.h>
26
26
#include <assert.h>
27
27
 
28
28
 
29
29
sqlite::query::query(
30
 
        connection &connection,
 
30
        database &database,
31
31
        const std::string &sql )
32
32
        :
33
 
        basic_statement( connection, sql ),
34
 
        _next_row_number( 0 )
 
33
        basic_statement( database, sql ),
 
34
        _next_row( 0 )
35
35
{
36
36
        assert( sqlite3_column_count( _handle ) > 0 );
37
37
}
38
38
 
39
39
 
40
40
sqlite::query::query(
41
 
        connection &connection )
 
41
        database &database )
42
42
        :
43
 
        basic_statement( connection ),
44
 
        _next_row_number( 0 )
 
43
        basic_statement( database ),
 
44
        _next_row( 0 )
45
45
{
46
46
}
47
47
 
49
49
int sqlite::query::prepare(
50
50
        const std::string &sql )
51
51
{
52
 
        _next_row_number = 0;
 
52
        _next_row = 0;
53
53
        int code = basic_statement::prepare( sql );
54
54
        assert( code != SQLITE_OK || sqlite3_column_count( _handle ) > 0 );
55
55
        return code;
56
56
}
57
57
 
58
58
 
59
 
int sqlite::query::reset()
60
 
{
61
 
        _next_row_number = 0;
62
 
        return basic_statement::reset();
63
 
}
64
 
 
65
 
 
66
59
sqlite::row sqlite::query::step()
67
60
{
68
 
        connection::mutex_guard lock( _connection );
 
61
        database::database_mutex_guard lock( _database );
69
62
 
70
63
        int code = basic_statement::step();
71
64
        if( code == SQLITE_DONE ) return row();
72
 
        if( code == SQLITE_ROW ) return row( _handle, _next_row_number++ );
 
65
        if( code == SQLITE_ROW ) return row( _handle, _next_row++ );
73
66
 
74
 
        throw sqlite_error( _connection, code );
 
67
        throw sqlite_error( _database, code );
75
68
}
76
69
 
77
70
 
90
83
}
91
84
 
92
85
 
93
 
unsigned long long sqlite::query::num_results()
94
 
{
95
 
        reset();
96
 
        unsigned long long count = 0;
97
 
        while( step() ) count++;
98
 
        reset();
99
 
        return count;
100
 
}
101
 
 
102
 
 
103
86
sqlite::query::iterator::iterator(
104
87
        sqlite::query &query,
105
 
        bool step )
 
88
        bool valid )
106
89
        :
107
90
        _query( query )
108
91
{
109
 
        if( step ) increment();
 
92
        if( valid )
 
93
                increment();
 
94
        else
 
95
                _valid = false;
110
96
}
111
97
 
112
98
 
113
99
sqlite::row sqlite::query::iterator::dereference() const
114
100
{
115
 
        return _row;
 
101
        return sqlite::row( _query._handle, _query._next_row++ );
116
102
}
117
103
 
118
104
 
119
105
void sqlite::query::iterator::increment()
120
106
{
121
 
        _row = _query.step();
 
107
        _valid = _query.step();
122
108
}
123
109
 
124
110
 
126
112
        sqlite::query::iterator const &other )
127
113
        const
128
114
{
129
 
        return _row == other._row;
 
115
        return _valid == other._valid;
130
116
}
131
117
 
132
118
 
133
119
sqlite::query::iterator sqlite::query::begin()
134
120
{
135
 
        reset();
136
121
        return sqlite::query::iterator( *this, true );
137
122
}
138
123