/sqlite3cc

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

« back to all changes in this revision

Viewing changes to src/command.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/command.cc
21
21
 */
22
22
 
23
23
#include <sqlite3cc/command.h>
24
 
#include <sqlite3cc/database.h>
25
 
#include <boost/thread/locks.hpp>
 
24
#include <sqlite3cc/connection.h>
 
25
#include <sqlite3cc/manipulator.h>
26
26
#include <cassert>
27
27
 
28
28
 
29
 
boost::recursive_mutex sqlite::command::_command_mutex;
30
 
 
31
 
 
32
29
sqlite::command::command(
33
 
        database &database,
 
30
        connection &connection,
34
31
        const std::string &sql )
35
32
        :
36
 
        basic_statement( database, sql ),
 
33
        detail::basic_statement( connection, sql ),
37
34
        _changes( 0 ),
38
35
        _total_changes( 0 ),
39
36
        _last_insert_rowid( 0 )
43
40
 
44
41
 
45
42
sqlite::command::command(
46
 
        database &database )
 
43
        connection &connection )
47
44
        :
48
 
        basic_statement( database ),
 
45
        detail::basic_statement( connection ),
49
46
        _changes( 0 ),
50
47
        _total_changes( 0 ),
51
48
        _last_insert_rowid( 0 )
56
53
int sqlite::command::prepare(
57
54
        const std::string &sql )
58
55
{
59
 
        int error_code = basic_statement::prepare( sql );
60
 
        assert( error_code != SQLITE_OK || sqlite3_column_count( _handle ) == 0 );
61
 
        return error_code;
 
56
        int code = detail::basic_statement::prepare( sql );
 
57
        assert( code != SQLITE_OK || sqlite3_column_count( _handle ) == 0 );
 
58
        return code;
62
59
}
63
60
 
64
61
 
65
62
int sqlite::command::step()
66
63
{
67
 
        boost::lock_guard< boost::recursive_mutex > lock( _command_mutex );
68
 
        int error_code = basic_statement::step();
69
 
        if( error_code == SQLITE_OK ) {
70
 
                _changes = sqlite3_changes( _database._handle );
71
 
                _total_changes = sqlite3_total_changes( _database._handle );
72
 
                _last_insert_rowid = sqlite3_last_insert_rowid( _database._handle );
 
64
        connection::mutex_guard lock( _connection );
 
65
 
 
66
        int code = detail::basic_statement::step();
 
67
        if( code == SQLITE_ROW ) throw sqlite_error( "command has results" );
 
68
        if( code != SQLITE_DONE ) throw sqlite_error( _connection, code );
 
69
 
 
70
        _changes = sqlite3_changes( _connection._handle );
 
71
        _total_changes = sqlite3_total_changes( _connection._handle );
 
72
        _last_insert_rowid = sqlite3_last_insert_rowid( _connection._handle );
 
73
 
 
74
        lock.leave();
 
75
 
 
76
        // finalise now (which shouldn't matter for commands), so that there are no
 
77
        // active statements if we come to begin, commit or rollback a transaction
 
78
        finalize();
 
79
 
 
80
        return code;
 
81
}
 
82
 
 
83
 
 
84
template< >
 
85
sqlite::detail::basic_statement &sqlite::detail::basic_statement::operator <<
 
86
        < sqlite::detail::exec_t >(
 
87
        const sqlite::detail::exec_t & )
 
88
{
 
89
        sqlite::command &that = dynamic_cast< sqlite::command & >( *this );
 
90
 
 
91
        int code = that.step();
 
92
        if( code != SQLITE_DONE ) {
 
93
                if( code == SQLITE_ROW )
 
94
                        throw sqlite_error( "statement returned results" );
 
95
                else
 
96
                        throw sqlite_error( _connection, code );
73
97
        }
74
 
        return error_code;
 
98
        return *this;
75
99
}
 
100