/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-27 15:46:42 UTC
  • Revision ID: edam@waxworlds.org-20100727154642-1uxrjkpxhp7xl6hq
- moved null_t, exec_t and set_index_t to detail namespace so only their extern instantiations are in the main namespace
- added immediate transation

Show diffs side-by-side

added added

removed removed

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