/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:12:55 UTC
  • Revision ID: edam@waxworlds.org-20100727151255-goaqgdz4kj13q7gz
- update TODO
- added some missing includes for <string>
- changed usage of database::exec() to not require return code!
- prevented transaction_guard destructor from throwing an exception

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/manipulator.h>
26
 
#include <sqlite3cc/database.h>
27
25
#include <assert.h>
28
26
 
29
27
 
51
49
        const std::string &sql )
52
50
{
53
51
        _next_row = 0;
54
 
        int code = basic_statement::prepare( sql );
55
 
        assert( code != SQLITE_OK || sqlite3_column_count( _handle ) > 0 );
56
 
        return code;
 
52
        int error_code = basic_statement::prepare( sql );
 
53
        assert( error_code != SQLITE_OK || sqlite3_column_count( _handle ) > 0 );
 
54
        return error_code;
57
55
}
58
56
 
59
57
 
60
58
sqlite::row sqlite::query::step()
61
59
{
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 );
 
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
//      }
69
77
}
70
78
 
71
79
 
127
135
{
128
136
        return sqlite::query::iterator( *this, false );
129
137
}
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
 
}