/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 06:28:53 UTC
  • Revision ID: edam@waxworlds.org-20100729062853-4i2fec52m86mh724
- made basic_statement::step() protected, for use by query and command only
- moved basic_statement::operator<<() to command and query instead; one needs to accept sqlite::exec, the other doesn't
- added tests for query::operator<<()
- added code to invlaidate in-progress queries during any transaction rollbacks (currently segfaults in basic_statement::finalize())
- added new sqlite_error constructor that obtains a full error message
- implemented database::database_mutex_guard class
- swapped command's step mutex in favour of the database mutex

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/connection.h>
 
24
#include <sqlite3cc/database.h>
25
25
#include <sqlite3cc/manipulator.h>
26
26
#include <cassert>
27
27
 
28
28
 
29
29
sqlite::command::command(
30
 
        connection &connection,
 
30
        database &database,
31
31
        const std::string &sql )
32
32
        :
33
 
        detail::basic_statement( connection, sql ),
 
33
        basic_statement( database, 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
 
        connection &connection )
 
43
        database &database )
44
44
        :
45
 
        detail::basic_statement( connection ),
 
45
        basic_statement( database ),
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 = detail::basic_statement::prepare( sql );
 
56
        int code = 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
 
        connection::mutex_guard lock( _connection );
 
64
        database::database_mutex_guard lock( _database );
65
65
 
66
 
        int code = detail::basic_statement::step();
 
66
        int code = basic_statement::step();
67
67
        if( code == SQLITE_ROW ) throw sqlite_error( "command has results" );
68
 
        if( code != SQLITE_DONE ) throw sqlite_error( _connection, code );
 
68
        if( code != SQLITE_DONE ) throw sqlite_error( _database, code );
69
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 );
 
70
        _changes = sqlite3_changes( _database._handle );
 
71
        _total_changes = sqlite3_total_changes( _database._handle );
 
72
        _last_insert_rowid = sqlite3_last_insert_rowid( _database._handle );
73
73
 
74
74
        lock.leave();
75
75
 
82
82
 
83
83
 
84
84
template< >
85
 
sqlite::detail::basic_statement &sqlite::detail::basic_statement::operator <<
 
85
sqlite::command &sqlite::command::operator <<
 
86
        < sqlite::detail::null_t >(
 
87
        const sqlite::detail::null_t & )
 
88
{
 
89
        int code = bind_null( _bind_index );
 
90
        if( code != SQLITE_OK ) throw sqlite_error( _database, code );
 
91
        _bind_index++;
 
92
        return *this;
 
93
}
 
94
 
 
95
 
 
96
template< >
 
97
sqlite::command &sqlite::command::operator <<
86
98
        < sqlite::detail::exec_t >(
87
99
        const sqlite::detail::exec_t & )
88
100
{
89
 
        sqlite::command &that = dynamic_cast< sqlite::command & >( *this );
90
 
 
91
 
        int code = that.step();
 
101
        int code = step();
92
102
        if( code != SQLITE_DONE ) {
93
103
                if( code == SQLITE_ROW )
94
104
                        throw sqlite_error( "statement returned results" );
95
105
                else
96
 
                        throw sqlite_error( _connection, code );
 
106
                        throw sqlite_error( _database, code );
97
107
        }
98
108
        return *this;
99
109
}
100
110
 
 
111
 
 
112
template< >
 
113
sqlite::command &sqlite::command::operator <<
 
114
        < sqlite::detail::set_index_t >(
 
115
        const sqlite::detail::set_index_t &t )
 
116
{
 
117
        _bind_index = t._index;
 
118
        return *this;
 
119
}