/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>
 
24
#include <sqlite3cc/connection.h>
25
25
#include <sqlite3cc/manipulator.h>
26
26
#include <cassert>
27
27
 
28
28
 
29
29
sqlite::command::command(
30
 
        database &database,
 
30
        connection &connection,
31
31
        const std::string &sql )
32
32
        :
33
 
        basic_statement( database, sql ),
 
33
        detail::basic_statement( connection, sql ),
34
34
        _changes( 0 ),
35
35
        _total_changes( 0 ),
36
36
        _last_insert_rowid( 0 )
40
40
 
41
41
 
42
42
sqlite::command::command(
43
 
        database &database )
 
43
        connection &connection )
44
44
        :
45
 
        basic_statement( database ),
 
45
        detail::basic_statement( connection ),
46
46
        _changes( 0 ),
47
47
        _total_changes( 0 ),
48
48
        _last_insert_rowid( 0 )
53
53
int sqlite::command::prepare(
54
54
        const std::string &sql )
55
55
{
56
 
        int code = basic_statement::prepare( sql );
 
56
        int code = detail::basic_statement::prepare( sql );
57
57
        assert( code != SQLITE_OK || sqlite3_column_count( _handle ) == 0 );
58
58
        return code;
59
59
}
61
61
 
62
62
int sqlite::command::step()
63
63
{
64
 
        database::database_mutex_guard lock( _database );
 
64
        connection::mutex_guard lock( _connection );
65
65
 
66
 
        int code = basic_statement::step();
 
66
        int code = detail::basic_statement::step();
67
67
        if( code == SQLITE_ROW ) throw sqlite_error( "command has results" );
68
 
        if( code != SQLITE_DONE ) throw sqlite_error( _database, code );
 
68
        if( code != SQLITE_DONE ) throw sqlite_error( _connection, code );
69
69
 
70
 
        _changes = sqlite3_changes( _database._handle );
71
 
        _total_changes = sqlite3_total_changes( _database._handle );
72
 
        _last_insert_rowid = sqlite3_last_insert_rowid( _database._handle );
 
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
73
 
74
74
        lock.leave();
75
75
 
82
82
 
83
83
 
84
84
template< >
85
 
sqlite::basic_statement &sqlite::basic_statement::operator <<
 
85
sqlite::detail::basic_statement &sqlite::detail::basic_statement::operator <<
86
86
        < sqlite::detail::exec_t >(
87
87
        const sqlite::detail::exec_t & )
88
88
{
93
93
                if( code == SQLITE_ROW )
94
94
                        throw sqlite_error( "statement returned results" );
95
95
                else
96
 
                        throw sqlite_error( _database, code );
 
96
                        throw sqlite_error( _connection, code );
97
97
        }
98
98
        return *this;
99
99
}