/sqlite3cc

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

« back to all changes in this revision

Viewing changes to src/query.cc

  • Committer: edam
  • Date: 2010-02-08 22:08:57 UTC
  • Revision ID: edam@waxworlds.org-20100208220857-5up6fi4y6jh5bz4k
- removed "OK" from test-main when test is successful
- aranged for test/test-main to buld properly and be called from "make check"
- added include/Makefile.am to arrange for installation of library headers
- added project website to configure.ac
- added library interface configuration variable to configure.ac

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/query.cc
22
22
 
23
23
#include <sqlite3cc/query.h>
24
24
#include <sqlite3cc/row.h>
25
 
#include <sqlite3cc/connection.h>
26
25
#include <assert.h>
27
26
 
28
27
 
29
28
sqlite::query::query(
30
 
        connection &connection,
 
29
        database &database,
31
30
        const std::string &sql )
32
31
        :
33
 
        basic_statement( connection, sql ),
34
 
        _next_row_number( 0 )
 
32
        basic_statement( database, sql )
35
33
{
36
34
        assert( sqlite3_column_count( _handle ) > 0 );
37
35
}
38
36
 
39
37
 
40
38
sqlite::query::query(
41
 
        connection &connection )
 
39
        database &database )
42
40
        :
43
 
        basic_statement( connection ),
44
 
        _next_row_number( 0 )
 
41
        basic_statement( database )
45
42
{
46
43
}
47
44
 
49
46
int sqlite::query::prepare(
50
47
        const std::string &sql )
51
48
{
52
 
        _next_row_number = 0;
53
 
        int code = basic_statement::prepare( sql );
54
 
        assert( code != SQLITE_OK || sqlite3_column_count( _handle ) > 0 );
55
 
        return code;
56
 
}
57
 
 
58
 
 
59
 
int sqlite::query::reset()
60
 
{
61
 
        _next_row_number = 0;
62
 
        return basic_statement::reset();
 
49
        int error_code = basic_statement::prepare( sql );
 
50
        assert( error_code != SQLITE_OK || sqlite3_column_count( _handle ) > 0 );
 
51
        return error_code;
63
52
}
64
53
 
65
54
 
66
55
sqlite::row sqlite::query::step()
67
56
{
68
 
        connection::mutex_guard lock( _connection );
69
 
 
70
 
        int code = basic_statement::step();
71
 
        if( code == SQLITE_DONE ) return row();
72
 
        if( code == SQLITE_ROW ) return row( _handle, _next_row_number++ );
73
 
 
74
 
        throw sqlite_error( _connection, code );
 
57
        int error_code = basic_statement::step();
 
58
        if( error_code == SQLITE_ROW )
 
59
                return row( *this );
 
60
        if( error_code == SQLITE_DONE )
 
61
                return row( *this, false );
 
62
        throw sqlite_error( error_code );
75
63
}
76
64
 
77
65
 
79
67
{
80
68
        return sqlite3_column_count( _handle );
81
69
}
82
 
 
83
 
 
84
 
const std::string sqlite::query::column_name(
85
 
        unsigned int index )
86
 
{
87
 
        assert( index <
88
 
                static_cast< unsigned int >( sqlite3_column_count( _handle ) ) );
89
 
        return sqlite3_column_name( _handle, index );
90
 
}
91
 
 
92
 
 
93
 
unsigned long long sqlite::query::num_results()
94
 
{
95
 
        reset();
96
 
        unsigned long long count = 0;
97
 
        while( step() ) count++;
98
 
        reset();
99
 
        return count;
100
 
}
101
 
 
102
 
 
103
 
sqlite::query::iterator::iterator(
104
 
        sqlite::query &query,
105
 
        bool step )
106
 
        :
107
 
        _query( query )
108
 
{
109
 
        if( step ) increment();
110
 
}
111
 
 
112
 
 
113
 
sqlite::row sqlite::query::iterator::dereference() const
114
 
{
115
 
        return _row;
116
 
}
117
 
 
118
 
 
119
 
void sqlite::query::iterator::increment()
120
 
{
121
 
        _row = _query.step();
122
 
}
123
 
 
124
 
 
125
 
bool sqlite::query::iterator::equal(
126
 
        sqlite::query::iterator const &other )
127
 
        const
128
 
{
129
 
        return _row == other._row;
130
 
}
131
 
 
132
 
 
133
 
sqlite::query::iterator sqlite::query::begin()
134
 
{
135
 
        reset();
136
 
        return sqlite::query::iterator( *this, true );
137
 
}
138
 
 
139
 
 
140
 
sqlite::query::iterator sqlite::query::end()
141
 
{
142
 
        return sqlite::query::iterator( *this, false );
143
 
}
144