/sqlite3cc

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

« back to all changes in this revision

Viewing changes to src/database.cc

  • Committer: edam
  • Date: 2010-02-02 16:13:16 UTC
  • Revision ID: edam@waxworlds.org-20100202161316-tceybmdeotltldow
- print "ok" when test program is successful!
- renamed 'Makefile's 'subdir.mk' so that the edam.mk build system will live happily along side an autotools build system

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/database.cc
1
1
/*
2
 
 * connection.cc
 
2
 * database.cc
3
3
 *
4
4
 * Copyright (C) 2009 Tim Marston <edam@waxworlds.org>
5
5
 *
20
20
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
21
21
 */
22
22
 
23
 
#include <sqlite3cc/connection.h>
 
23
#include <sqlite3cc/database.h>
24
24
#include <sqlite3cc/exception.h>
25
25
 
26
26
 
27
 
sqlite::connection::mutex_guard::mutex_guard(
28
 
        connection &connection )
29
 
        :
30
 
        _mutex( sqlite3_db_mutex( connection._handle ) )
31
 
{
32
 
        if( _mutex ) sqlite3_mutex_enter( _mutex );
33
 
}
34
 
 
35
 
 
36
 
sqlite::connection::mutex_guard::~mutex_guard()
37
 
{
38
 
        leave();
39
 
}
40
 
 
41
 
void sqlite::connection::mutex_guard::leave()
42
 
{
43
 
        if( _mutex ) {
44
 
                sqlite3_mutex_leave( _mutex );
45
 
                _mutex = NULL;
46
 
        }
47
 
}
48
 
 
49
 
 
50
 
sqlite::connection::connection(
 
27
sqlite::database::database(
51
28
        const std::string &filename )
52
29
        :
53
30
        _handle( NULL )
54
31
{
55
 
        int code = open( filename );
56
 
        if( code != SQLITE_OK ) throw sqlite_error( *this, code );
 
32
        int error_code = open( filename );
 
33
        if( error_code != SQLITE_OK ) throw sqlite_error( error_code );
57
34
}
58
35
 
59
36
 
60
 
sqlite::connection::connection()
 
37
sqlite::database::database()
61
38
        :
62
39
        _handle( NULL )
63
40
{
64
41
}
65
42
 
66
43
 
67
 
sqlite::connection::~connection()
 
44
sqlite::database::~database() throw( )
68
45
{
69
46
        close();
70
47
}
71
48
 
72
49
 
73
 
int sqlite::connection::open(
 
50
int sqlite::database::open(
74
51
        const std::string &filename,
75
52
        int flags )
76
53
{
79
56
}
80
57
 
81
58
 
82
 
void sqlite::connection::close()
 
59
void sqlite::database::close()
83
60
{
84
61
        if( _handle ) {
85
62
                sqlite3_close( _handle );
88
65
}
89
66
 
90
67
 
91
 
void sqlite::connection::exec(
 
68
int sqlite::database::exec(
92
69
        const std::string &sql )
93
70
{
94
 
        int code = sqlite3_exec( _handle, sql.c_str(), NULL, NULL, NULL );
95
 
        if( code != SQLITE_OK ) throw sqlite_error( *this, code );
 
71
        return sqlite3_exec( _handle, sql.c_str(), NULL, NULL, NULL );
96
72
}
97
73
 
98
74
 
99
 
int sqlite::connection::busy_timeout(
 
75
int sqlite::database::busy_timeout(
100
76
        int duration )
101
77
{
102
78
        return sqlite3_busy_timeout( _handle, duration );