/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

Lines of Context:
src/command.cc
22
22
 
23
23
#include <sqlite3cc/command.h>
24
24
#include <sqlite3cc/database.h>
25
 
#include <boost/thread/locks.hpp>
 
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
30
        database &database,
34
31
        const std::string &sql )
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 = 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
        database::database_mutex_guard lock( _database );
 
65
 
 
66
        int code = basic_statement::step();
 
67
        if( code == SQLITE_ROW ) throw sqlite_error( "command has results" );
 
68
        if( code != SQLITE_DONE ) throw sqlite_error( _database, code );
 
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 );
 
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::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 <<
 
98
        < sqlite::detail::exec_t >(
 
99
        const sqlite::detail::exec_t & )
 
100
{
 
101
        int code = step();
 
102
        if( code != SQLITE_DONE ) {
 
103
                if( code == SQLITE_ROW )
 
104
                        throw sqlite_error( "statement returned results" );
 
105
                else
 
106
                        throw sqlite_error( _database, code );
73
107
        }
74
 
        return error_code;
 
108
        return *this;
 
109
}
 
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;
75
119
}