/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
82
82
 
83
83
 
84
84
template< >
85
 
sqlite::basic_statement &sqlite::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" );
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
}