/sqlite3cc

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

« back to all changes in this revision

Viewing changes to src/transaction.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/transaction.cc
47
47
}
48
48
 
49
49
 
 
50
void sqlite::basic_transaction::invalidate_queries()
 
51
{
 
52
        while( sqlite3_stmt *handle = sqlite3_next_stmt( _database._handle, NULL ) )
 
53
                if( int code = sqlite3_finalize( handle ) )
 
54
                        throw sqlite_error( _database, code );
 
55
}
 
56
 
 
57
 
50
58
void sqlite::basic_transaction::rollback()
51
59
{
 
60
        // we must invalidate any active queries when rolling back
 
61
        invalidate_queries();
52
62
        _database.exec( "ROLLBACK" );
53
63
}
54
64
 
87
97
        basic_transaction( database )
88
98
{
89
99
        static unsigned long long i = 0;
 
100
        static boost::mutex mutex;
90
101
        unsigned long long my_i;
91
 
        static boost::mutex mutex;
92
102
        {
93
103
                boost::lock_guard< boost::mutex > lock( mutex );
94
104
                my_i = i++;
111
121
 
112
122
void sqlite::recursive_transaction::rollback()
113
123
{
 
124
        // we must invalidate any active queries when rolling back
 
125
        invalidate_queries();
114
126
        _database.exec( "ROLLBACK TO " + _sp_name );
115
127
 
116
128
        // we have rolled back this transaction's savepoint, but the savepoint will