/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-23 09:17:03 UTC
  • Revision ID: edam@waxworlds.org-20100723091703-3siqjj6eeux9hupz
- added NEWS
- added library checks to configure.ac
- added query::iterators
- remove dependency that rows have on querys (since querys have to be dependent on rows for boost::iterator_facade to work)
- rows now have the handle to the sqlite3 statement and know a count of their row number
- added convenience function tht can be used to detect presence of sqlite3cc in other packages
- updated test-main
- renamed all subdir.mk files to emake.mk

Show diffs side-by-side

added added

removed removed

Lines of Context:
34
34
                boost::filesystem::remove( DBFILE );
35
35
 
36
36
        // open database
37
 
        sqlite::connection db( DBFILE );
38
 
 
39
 
        std::cout << "SQLite threading mode: " << sqlite::threadsafe() << "\n";
 
37
        sqlite::database db( DBFILE );
40
38
 
41
39
        // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
42
40
 
58
56
        sqlite::command c7( db, "INSERT INTO pets VALUES( :foo, :bar )" );
59
57
        c7.bind( ":foo", "foocat" ); c7.bind( ":bar", 22 ); c7.exec();
60
58
 
61
 
        // test command binding via stream operator
 
59
        // test basic_statement binding via stream operator
 
60
        sqlite::command c4( db, "INSERT INTO pets VALUES( ?, ? )" );
 
61
        c4 << "tessa" << 16 << sqlite::exec;
62
62
        sqlite::command( db, "INSERT INTO pets VALUES( ?, ? )" ) <<
63
 
                "tessa" << 16 << sqlite::exec;
64
 
        sqlite::command c4( db, "INSERT INTO pets VALUES( ?, ? )" );
65
 
        c4 << sqlite::null << sqlite::null << sqlite::set_index( 1 ) <<
66
 
                "tamara" << sqlite::exec;
67
 
        assert( c4.changes() == 1 );
68
 
 
69
 
        // test query binding via stream operator
70
 
        sqlite::query( db, "SELECT * FROM pets WHERE name = ? OR age = ?" )
71
 
                << "foo" << 16;
72
 
        sqlite::query( db, "SELECT * FROM pets WHERE name = ? OR name = ? OR "
73
 
                "name = ? OR name = ?" ) << "foo" << sqlite::null << sqlite::null
74
 
                << sqlite::set_index( 1 ) << "bar" << "baz";
 
63
                sqlite::null << sqlite::null <<
 
64
                sqlite::set_index( 1 ) << "tamara" << sqlite::exec;
75
65
 
76
66
        // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
77
67
 
79
69
        sqlite::query q1( db, "SELECT age, age + 3, name "
80
70
                "FROM pets WHERE NOT age IS NULL "
81
71
                "ORDER BY age ASC" );
82
 
 
83
 
        // test column count and names
84
72
        assert( q1.column_count() == 3 );
85
 
        assert( q1.column_name( 2 ) == "name" );
86
73
 
87
74
        // test rows
88
75
        unsigned int age;
109
96
        // test end of results
110
97
        assert( !q1.step() );
111
98
 
112
 
        // test num results
113
 
        sqlite::query q3( db, "SELECT name FROM pets WHERE age = 16" );
114
 
        assert( q3.num_results() == 2 );
115
 
 
116
99
        // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
117
100
 
118
 
        // test query iterator
 
101
        // test query itterator
119
102
        sqlite::query q2( db, "SELECT * FROM pets ORDER BY age DESC" );
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 )
 
103
        for( sqlite::query::iterator i = q2.begin(); i != q2.end(); i++ ) {
 
104
                if( i->index() == 3 )
130
105
                        assert( i->column< std::string >( 0 ) == "tessa" &&
131
106
                                i->column< unsigned int >( 1 ) == 16 );
132
 
        }
133
 
 
134
 
//      for( sqlite::query::iterator i = q2.begin(); i != q2.end(); i++ ) {
135
107
//              for( unsigned int a = 0; a < q2.column_count(); a++ )
136
108
//                      std::cout << q2.column_name( a ) << "[" <<
137
109
//                      i->column< std::string >( a ) << "] ";
138
110
//              std::cout << "\n";
139
 
//      }
 
111
        }
 
112
        assert( q2.column_count() == 2 );
 
113
        assert( q2.column_name( 0 ) == "name" );
140
114
 
141
115
        // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
142
116
 
143
117
        // test transactions
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
 
        }
 
118
        {       sqlite::transaction_guard< > t1( db ); }
 
119
        {       sqlite::transaction_guard< sqlite::exclusive_transaction > t1( db ); }
 
120
        {       sqlite::transaction_guard< sqlite::recursive_transaction > t1( db );
 
121
                sqlite::transaction_guard< sqlite::recursive_transaction > t2( db ); }
157
122
 
158
123
        // test transaction guard rollback
159
124
        {
175
140
 
176
141
                sqlite::query( db, "SELECT age FROM pets ORDER BY age DESC LIMIT 1" )
177
142
                        .step() >> age; assert( age == 66 );
 
143
 
 
144
                //t1.commit();
178
145
        }
179
146
        sqlite::query( db, "SELECT age FROM pets ORDER BY age DESC LIMIT 1" )
180
147
                .step() >> age; assert( age == 123 );