Diffstat (limited to 'libopie2/opiedb/osqlitedriver.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp index 6141504..47bc250 100644 --- a/libopie2/opiedb/osqlitedriver.cpp +++ b/libopie2/opiedb/osqlitedriver.cpp | |||
@@ -31,24 +31,27 @@ | |||
31 | #include "osqlquery.h" | 31 | #include "osqlquery.h" |
32 | #include "osqlitedriver.h" | 32 | #include "osqlitedriver.h" |
33 | 33 | ||
34 | #include <opie2/odebug.h> | 34 | #include <opie2/odebug.h> |
35 | 35 | ||
36 | #include <stdlib.h> | 36 | #include <stdlib.h> |
37 | 37 | ||
38 | // fromLocal8Bit() does not work as expected. Thus it | 38 | // fromLocal8Bit() does not work as expected. Thus it |
39 | // is replaced by fromLatin1() (eilers) | 39 | // is replaced by fromLatin1() (eilers) |
40 | #define __BUGGY_LOCAL8BIT_ | 40 | #define __BUGGY_LOCAL8BIT_ |
41 | 41 | ||
42 | 42 | ||
43 | using namespace Opie::DB; | ||
44 | using namespace Opie::DB::Private; | ||
45 | |||
43 | namespace { | 46 | namespace { |
44 | struct Query { | 47 | struct Query { |
45 | OSQLError::ValueList errors; | 48 | OSQLError::ValueList errors; |
46 | OSQLResultItem::ValueList items; | 49 | OSQLResultItem::ValueList items; |
47 | OSQLiteDriver *driver; | 50 | OSQLiteDriver *driver; |
48 | }; | 51 | }; |
49 | } | 52 | } |
50 | 53 | ||
51 | 54 | ||
52 | OSQLiteDriver::OSQLiteDriver( QLibrary *lib ) | 55 | OSQLiteDriver::OSQLiteDriver( QLibrary *lib ) |
53 | : OSQLDriver( lib ) | 56 | : OSQLDriver( lib ) |
54 | { | 57 | { |
@@ -77,33 +80,33 @@ void OSQLiteDriver::setUrl( const QString& url ) { | |||
77 | 80 | ||
78 | 81 | ||
79 | void OSQLiteDriver::setOptions( const QStringList& ) { | 82 | void OSQLiteDriver::setOptions( const QStringList& ) { |
80 | } | 83 | } |
81 | 84 | ||
82 | 85 | ||
83 | /* | 86 | /* |
84 | * try to open a db specified via setUrl | 87 | * try to open a db specified via setUrl |
85 | * and options | 88 | * and options |
86 | */ | 89 | */ |
87 | bool OSQLiteDriver::open() { | 90 | bool OSQLiteDriver::open() { |
88 | char *error; | 91 | char *error; |
89 | odebug << "OSQLiteDriver::open: about to open" << oendl; | 92 | qDebug("OSQLiteDriver::open: about to open"); |
90 | m_sqlite = sqlite_open(m_url.local8Bit(), | 93 | m_sqlite = sqlite_open(m_url.local8Bit(), |
91 | 0, | 94 | 0, |
92 | &error ); | 95 | &error ); |
93 | 96 | ||
94 | /* failed to open */ | 97 | /* failed to open */ |
95 | if (m_sqlite == 0l ) { | 98 | if (m_sqlite == 0l ) { |
96 | // FIXME set the last error | 99 | // FIXME set the last error |
97 | owarn << "OSQLiteDriver::open: " << error << oendl; | 100 | qWarning("OSQLiteDriver::open: %s", error ); |
98 | free( error ); | 101 | free( error ); |
99 | return false; | 102 | return false; |
100 | } | 103 | } |
101 | return true; | 104 | return true; |
102 | } | 105 | } |
103 | 106 | ||
104 | 107 | ||
105 | /* close the db | 108 | /* close the db |
106 | * sqlite closes them without | 109 | * sqlite closes them without |
107 | * telling failure or success | 110 | * telling failure or success |
108 | */ | 111 | */ |
109 | bool OSQLiteDriver::close() { | 112 | bool OSQLiteDriver::close() { |
@@ -117,25 +120,25 @@ bool OSQLiteDriver::close() { | |||
117 | /* Query */ | 120 | /* Query */ |
118 | OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { | 121 | OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { |
119 | if ( !m_sqlite ) { | 122 | if ( !m_sqlite ) { |
120 | // FIXME set error code | 123 | // FIXME set error code |
121 | OSQLResult result( OSQLResult::Failure ); | 124 | OSQLResult result( OSQLResult::Failure ); |
122 | return result; | 125 | return result; |
123 | } | 126 | } |
124 | Query query; | 127 | Query query; |
125 | query.driver = this; | 128 | query.driver = this; |
126 | char *err; | 129 | char *err; |
127 | /* SQLITE_OK 0 if return code > 0 == failure */ | 130 | /* SQLITE_OK 0 if return code > 0 == failure */ |
128 | if ( sqlite_exec(m_sqlite, qu->query(),&call_back, &query, &err) > 0 ) { | 131 | if ( sqlite_exec(m_sqlite, qu->query(),&call_back, &query, &err) > 0 ) { |
129 | owarn << "OSQLiteDriver::query: Error while executing" << oendl; | 132 | qWarning("OSQLiteDriver::query: Error while executing"); |
130 | free(err ); | 133 | free(err ); |
131 | // FixMe Errors | 134 | // FixMe Errors |
132 | } | 135 | } |
133 | 136 | ||
134 | OSQLResult result(OSQLResult::Success, | 137 | OSQLResult result(OSQLResult::Success, |
135 | query.items, | 138 | query.items, |
136 | query.errors ); | 139 | query.errors ); |
137 | return result; | 140 | return result; |
138 | } | 141 | } |
139 | 142 | ||
140 | 143 | ||
141 | OSQLTable::ValueList OSQLiteDriver::tables() const { | 144 | OSQLTable::ValueList OSQLiteDriver::tables() const { |