/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-23 12:57:07 UTC
  • Revision ID: edam@waxworlds.org-20100723125707-qu9jk9vvg2uewx7t
- cleaned up test-main
- fixed comment type
- made sqlite::exec() throw instead of returning sqlite error code

Show diffs side-by-side

added added

removed removed

src/command.cc
22
22
 
23
23
#include <sqlite3cc/command.h>
24
24
#include <sqlite3cc/database.h>
25
 
#include <sqlite3cc/manipulator.h>
 
25
#include <boost/thread/locks.hpp>
26
26
#include <cassert>
27
27
 
28
28
 
 
29
boost::recursive_mutex sqlite::command::_command_mutex;
 
30
 
 
31
 
29
32
sqlite::command::command(
30
33
        database &database,
31
34
        const std::string &sql )
53
56
int sqlite::command::prepare(
54
57
        const std::string &sql )
55
58
{
56
 
        int code = basic_statement::prepare( sql );
57
 
        assert( code != SQLITE_OK || sqlite3_column_count( _handle ) == 0 );
58
 
        return code;
 
59
        int error_code = basic_statement::prepare( sql );
 
60
        assert( error_code != SQLITE_OK || sqlite3_column_count( _handle ) == 0 );
 
61
        return error_code;
59
62
}
60
63
 
61
64
 
62
65
int sqlite::command::step()
63
66
{
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::basic_statement &sqlite::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( _database, code );
 
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 );
97
73
        }
98
 
        return *this;
 
74
        return error_code;
99
75
}
100