/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-01-31 21:12:21 UTC
  • Revision ID: edam@waxworlds.org-20100131211221-5xtrhfrchozhk326
- rewrote transaction classes and added transaction_guard
- removed leftover code (sqlite_busy error)
- added tests for transactions

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/manipulator.h>
26
 
#include <sqlite3cc/database.h>
27
25
#include <assert.h>
28
26
 
29
27
 
31
29
        database &database,
32
30
        const std::string &sql )
33
31
        :
34
 
        basic_statement( database, sql ),
35
 
        _next_row( 0 )
 
32
        basic_statement( database, sql )
36
33
{
37
34
        assert( sqlite3_column_count( _handle ) > 0 );
38
35
}
41
38
sqlite::query::query(
42
39
        database &database )
43
40
        :
44
 
        basic_statement( database ),
45
 
        _next_row( 0 )
 
41
        basic_statement( database )
46
42
{
47
43
}
48
44
 
50
46
int sqlite::query::prepare(
51
47
        const std::string &sql )
52
48
{
53
 
        _next_row = 0;
54
 
        int code = basic_statement::prepare( sql );
55
 
        assert( code != SQLITE_OK || sqlite3_column_count( _handle ) > 0 );
56
 
        return code;
 
49
        int error_code = basic_statement::prepare( sql );
 
50
        assert( error_code != SQLITE_OK || sqlite3_column_count( _handle ) > 0 );
 
51
        return error_code;
57
52
}
58
53
 
59
54
 
60
55
sqlite::row sqlite::query::step()
61
56
{
62
 
        database::database_mutex_guard lock( _database );
63
 
 
64
 
        int code = basic_statement::step();
65
 
        if( code == SQLITE_DONE ) return row();
66
 
        if( code == SQLITE_ROW ) return row( _handle, _next_row++ );
67
 
 
68
 
        throw sqlite_error( _database, code );
 
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 );
69
63
}
70
64
 
71
65
 
73
67
{
74
68
        return sqlite3_column_count( _handle );
75
69
}
76
 
 
77
 
 
78
 
const std::string sqlite::query::column_name(
79
 
        unsigned int index )
80
 
{
81
 
        assert( index <
82
 
                static_cast< unsigned int >( sqlite3_column_count( _handle ) ) );
83
 
        return sqlite3_column_name( _handle, index );
84
 
}
85
 
 
86
 
 
87
 
sqlite::query::iterator::iterator(
88
 
        sqlite::query &query,
89
 
        bool valid )
90
 
        :
91
 
        _query( query )
92
 
{
93
 
        if( valid )
94
 
                increment();
95
 
        else
96
 
                _valid = false;
97
 
}
98
 
 
99
 
 
100
 
sqlite::row sqlite::query::iterator::dereference() const
101
 
{
102
 
        return sqlite::row( _query._handle, _query._next_row++ );
103
 
}
104
 
 
105
 
 
106
 
void sqlite::query::iterator::increment()
107
 
{
108
 
        _valid = _query.step();
109
 
}
110
 
 
111
 
 
112
 
bool sqlite::query::iterator::equal(
113
 
        sqlite::query::iterator const &other )
114
 
        const
115
 
{
116
 
        return _valid == other._valid;
117
 
}
118
 
 
119
 
 
120
 
sqlite::query::iterator sqlite::query::begin()
121
 
{
122
 
        return sqlite::query::iterator( *this, true );
123
 
}
124
 
 
125
 
 
126
 
sqlite::query::iterator sqlite::query::end()
127
 
{
128
 
        return sqlite::query::iterator( *this, false );
129
 
}
130
 
 
131
 
 
132
 
template< >
133
 
sqlite::query &sqlite::query::operator <<
134
 
        < sqlite::detail::null_t >(
135
 
        const sqlite::detail::null_t & )
136
 
{
137
 
        int code = bind_null( _bind_index );
138
 
        if( code != SQLITE_OK ) throw sqlite_error( _database, code );
139
 
        _bind_index++;
140
 
        return *this;
141
 
}
142
 
 
143
 
 
144
 
template< >
145
 
sqlite::query &sqlite::query::operator <<
146
 
        < sqlite::detail::set_index_t >(
147
 
        const sqlite::detail::set_index_t &t )
148
 
{
149
 
        _bind_index = t._index;
150
 
        return *this;
151
 
}