/sqlite3cc

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

« back to all changes in this revision

Viewing changes to test/test-main.cc

  • Committer: edam
  • Date: 2010-07-29 20:56:19 UTC
  • Revision ID: edam@waxworlds.org-20100729205619-a9yo4uzu647nvnsj
- renamed database to connection to better identify what it is (would database_connection be better though?)
- moved basic_statement and basic_transaction to sqlite::detail
- made sqlite::threadsafe() return the threading mode int, not a bool
- renamed row::index() to row_number() so it isn't confused with column index
- added typedef for deferred_transaction
- added early rollback method to transaction_guard
- allowed transaction_guard::~transaction_guard() to throw exceptions, since when it needs to, we're really screwed anyway
- bugfix: query::reset() didn't reset the internal row counter
- added query::num_results()
- added docs/design-notes
- reimplemented query::iterator so that increment() (which performs a step() on the query) now caches the returned row to be returned during dereference() (previously it stashed details and returned new row!?)
- bugfix: resetting active queries during rollbacks would hang!

Show diffs side-by-side

added added

removed removed

test/test-main.cc
34
34
                boost::filesystem::remove( DBFILE );
35
35
 
36
36
        // open database
37
 
        sqlite::database db( DBFILE );
 
37
        sqlite::connection db( DBFILE );
 
38
 
 
39
        std::cout << "SQLite threading mode: " << sqlite::threadsafe() << "\n";
38
40
 
39
41
        // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
40
42
 
77
79
        sqlite::query q1( db, "SELECT age, age + 3, name "
78
80
                "FROM pets WHERE NOT age IS NULL "
79
81
                "ORDER BY age ASC" );
 
82
 
 
83
        // test column count and names
80
84
        assert( q1.column_count() == 3 );
 
85
        assert( q1.column_name( 2 ) == "name" );
81
86
 
82
87
        // test rows
83
88
        unsigned int age;
104
109
        // test end of results
105
110
        assert( !q1.step() );
106
111
 
 
112
        // test num results
 
113
        sqlite::query q3( db, "SELECT name FROM pets WHERE age = 16" );
 
114
        assert( q3.num_results() == 2 );
 
115
 
107
116
        // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
108
117
 
109
 
        // test query itterator
 
118
        // test query iterator
110
119
        sqlite::query q2( db, "SELECT * FROM pets ORDER BY age DESC" );
111
 
        for( sqlite::query::iterator i = q2.begin(); i != q2.end(); i++ ) {
112
 
                if( i->index() == 3 )
 
120
        sqlite::query::iterator i1 = q2.begin();
 
121
        assert( i1 != q2.end() );
 
122
 
 
123
        // test resetting iterators
 
124
        unsigned int count = 0;
 
125
        for( sqlite::query::iterator i = q2.begin(); i != q2.end(); i++ )
 
126
        {
 
127
                // test iterator dereferencing and row numbers
 
128
                assert( count++ == i->row_number() );
 
129
                if( i->row_number() == 3 )
113
130
                        assert( i->column< std::string >( 0 ) == "tessa" &&
114
131
                                i->column< unsigned int >( 1 ) == 16 );
 
132
        }
 
133
 
 
134
//      for( sqlite::query::iterator i = q2.begin(); i != q2.end(); i++ ) {
115
135
//              for( unsigned int a = 0; a < q2.column_count(); a++ )
116
136
//                      std::cout << q2.column_name( a ) << "[" <<
117
137
//                      i->column< std::string >( a ) << "] ";
118
138
//              std::cout << "\n";
119
 
        }
120
 
        assert( q2.column_count() == 2 );
121
 
        assert( q2.column_name( 0 ) == "name" );
 
139
//      }
122
140
 
123
141
        // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
124
142
 
125
143
        // test transactions
126
 
        {       sqlite::transaction_guard< > t1( db ); }
127
 
        {       sqlite::transaction_guard< sqlite::exclusive_transaction > t1( db ); }
128
 
        {       sqlite::transaction_guard< sqlite::recursive_transaction > t1( db );
129
 
                sqlite::transaction_guard< sqlite::recursive_transaction > t2( db ); }
 
144
        {
 
145
                sqlite::transaction_guard< sqlite::deferred_tranaction > t1( db );
 
146
        }
 
147
        {
 
148
                sqlite::transaction_guard< sqlite::immediate_transaction > t1( db );
 
149
        }
 
150
        {
 
151
                sqlite::transaction_guard< sqlite::exclusive_transaction > t1( db );
 
152
        }
 
153
        {
 
154
                sqlite::transaction_guard< sqlite::recursive_transaction > t1( db );
 
155
                sqlite::transaction_guard< sqlite::recursive_transaction > t2( db );
 
156
        }
130
157
 
131
158
        // test transaction guard rollback
132
159
        {