/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 20:56:19 UTC
  • Revision ID: edam@waxworlds.org-20100729205619-a9yo4uzu647nvnsj
- renamed database to connection to better identify what it is (would database_connection be better though?)
- moved basic_statement and basic_transaction to sqlite::detail
- made sqlite::threadsafe() return the threading mode int, not a bool
- renamed row::index() to row_number() so it isn't confused with column index
- added typedef for deferred_transaction
- added early rollback method to transaction_guard
- allowed transaction_guard::~transaction_guard() to throw exceptions, since when it needs to, we're really screwed anyway
- bugfix: query::reset() didn't reset the internal row counter
- added query::num_results()
- added docs/design-notes
- reimplemented query::iterator so that increment() (which performs a step() on the query) now caches the returned row to be returned during dereference() (previously it stashed details and returned new row!?)
- bugfix: resetting active queries during rollbacks would hang!

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
26
#include <assert.h>
26
27
 
27
28
 
28
29
sqlite::query::query(
29
 
        database &database,
 
30
        connection &connection,
30
31
        const std::string &sql )
31
32
        :
32
 
        basic_statement( database, sql )
 
33
        basic_statement( connection, sql ),
 
34
        _next_row_number( 0 )
33
35
{
34
36
        assert( sqlite3_column_count( _handle ) > 0 );
35
37
}
36
38
 
37
39
 
38
40
sqlite::query::query(
39
 
        database &database )
 
41
        connection &connection )
40
42
        :
41
 
        basic_statement( database )
 
43
        basic_statement( connection ),
 
44
        _next_row_number( 0 )
42
45
{
43
46
}
44
47
 
46
49
int sqlite::query::prepare(
47
50
        const std::string &sql )
48
51
{
49
 
        int error_code = basic_statement::prepare( sql );
50
 
        assert( error_code != SQLITE_OK || sqlite3_column_count( _handle ) > 0 );
51
 
        return error_code;
 
52
        _next_row_number = 0;
 
53
        int code = basic_statement::prepare( sql );
 
54
        assert( code != SQLITE_OK || sqlite3_column_count( _handle ) > 0 );
 
55
        return code;
 
56
}
 
57
 
 
58
 
 
59
int sqlite::query::reset()
 
60
{
 
61
        _next_row_number = 0;
 
62
        return basic_statement::reset();
52
63
}
53
64
 
54
65
 
55
66
sqlite::row sqlite::query::step()
56
67
{
57
 
        int error_code = basic_statement::step();
58
 
        if( error_code == SQLITE_ROW )
59
 
                return row( *this );
60
 
        if( error_code == SQLITE_DONE )
61
 
                return row( *this, false );
62
 
        throw sqlite_error( error_code );
 
68
        connection::mutex_guard lock( _connection );
 
69
 
 
70
        int code = basic_statement::step();
 
71
        if( code == SQLITE_DONE ) return row();
 
72
        if( code == SQLITE_ROW ) return row( _handle, _next_row_number++ );
 
73
 
 
74
        throw sqlite_error( _connection, code );
63
75
}
64
76
 
65
77
 
67
79
{
68
80
        return sqlite3_column_count( _handle );
69
81
}
 
82
 
 
83
 
 
84
const std::string sqlite::query::column_name(
 
85
        unsigned int index )
 
86
{
 
87
        assert( index <
 
88
                static_cast< unsigned int >( sqlite3_column_count( _handle ) ) );
 
89
        return sqlite3_column_name( _handle, index );
 
90
}
 
91
 
 
92
 
 
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
sqlite::query::iterator::iterator(
 
104
        sqlite::query &query,
 
105
        bool step )
 
106
        :
 
107
        _query( query )
 
108
{
 
109
        if( step ) increment();
 
110
}
 
111
 
 
112
 
 
113
sqlite::row sqlite::query::iterator::dereference() const
 
114
{
 
115
        return _row;
 
116
}
 
117
 
 
118
 
 
119
void sqlite::query::iterator::increment()
 
120
{
 
121
        _row = _query.step();
 
122
}
 
123
 
 
124
 
 
125
bool sqlite::query::iterator::equal(
 
126
        sqlite::query::iterator const &other )
 
127
        const
 
128
{
 
129
        return _row == other._row;
 
130
}
 
131
 
 
132
 
 
133
sqlite::query::iterator sqlite::query::begin()
 
134
{
 
135
        reset();
 
136
        return sqlite::query::iterator( *this, true );
 
137
}
 
138
 
 
139
 
 
140
sqlite::query::iterator sqlite::query::end()
 
141
{
 
142
        return sqlite::query::iterator( *this, false );
 
143
}
 
144