summaryrefslogtreecommitdiff
path: root/libopie2/opiedb
Side-by-side diff
Diffstat (limited to 'libopie2/opiedb') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiedb/config.in2
-rw-r--r--libopie2/opiedb/libopiedb2.control4
-rw-r--r--libopie2/opiedb/opiedb.pro2
-rw-r--r--libopie2/opiedb/osqlitedriver.cpp98
-rw-r--r--libopie2/opiedb/osqlitedriver.h4
5 files changed, 57 insertions, 53 deletions
diff --git a/libopie2/opiedb/config.in b/libopie2/opiedb/config.in
index 4d85609..0d74887 100644
--- a/libopie2/opiedb/config.in
+++ b/libopie2/opiedb/config.in
@@ -1,7 +1,7 @@
config LIBOPIE2DB
boolean "libopie2db (database related classes)"
default "y"
depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBSQLITE_DEP
- comment "libopie2db needs a libqpe, sqlite and libopie2core"
+ comment "libopie2db needs a libqpe, libsqlite3 and libopie2core"
depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBSQLITE_DEP)
diff --git a/libopie2/opiedb/libopiedb2.control b/libopie2/opiedb/libopiedb2.control
index 4859c46..29fae78 100644
--- a/libopie2/opiedb/libopiedb2.control
+++ b/libopie2/opiedb/libopiedb2.control
@@ -1,10 +1,10 @@
Package: libopiedb2
Files: lib/libopiedb2.so*
Priority: optional
Section: opie/system
Maintainer: Opie Team <opie@handhelds.org>
Architecture: arm
Version: 1.8.2-$SUB_VERSION.2
-Depends: libqpe1, libopiecore2 (1.8.2), libsqlite0 | sqlite
+Depends: libqpe1, libopiecore2 (1.8.2), libsqlite3 | sqlite3
Provides: libopiedb2
-Description: Opie library 2.0 DB
+Description: Opie library 2.1 DB
diff --git a/libopie2/opiedb/opiedb.pro b/libopie2/opiedb/opiedb.pro
index 8432674..f727995 100644
--- a/libopie2/opiedb/opiedb.pro
+++ b/libopie2/opiedb/opiedb.pro
@@ -1,43 +1,43 @@
TEMPLATE = lib
CONFIG += qt warn_on
DESTDIR = $(OPIEDIR)/lib
HEADERS = osqlbackend.h \
osqldriver.h \
osqlerror.h \
osqlmanager.h \
osqlquery.h \
osqlresult.h \
osqltable.h \
osqlbackendmanager.h \
osqlitedriver.h
SOURCES = osqlbackend.cpp \
osqldriver.cpp \
osqlerror.cpp \
osqlmanager.cpp \
osqlquery.cpp \
osqlresult.cpp \
osqltable.cpp \
osqlbackendmanager.cpp \
osqlitedriver.cpp
TARGET = opiedb2
VERSION = 1.9.0
INCLUDEPATH = $(OPIEDIR)/include
DEPENDPATH = $(OPIEDIR)/include
-LIBS += -lopiecore2 -lqpe -lsqlite
+LIBS += -lopiecore2 -lqpe -lsqlite3
!contains( platform, x11 ) {
include ( $(OPIEDIR)/include.pro )
}
contains( platform, x11 ) {
LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
}
!isEmpty( LIBSQLITE_INC_DIR ) {
INCLUDEPATH = $$LIBSQLITE_INC_DIR $$INCLUDEPATH
}
!isEmpty( LIBSQLITE_LIB_DIR ) {
LIBS = -L$$LIBSQLITE_LIB_DIR $$LIBS
}
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp
index c8b560f..816223e 100644
--- a/libopie2/opiedb/osqlitedriver.cpp
+++ b/libopie2/opiedb/osqlitedriver.cpp
@@ -58,171 +58,175 @@ OSQLiteDriver::OSQLiteDriver( QLibrary *lib )
OSQLiteDriver::~OSQLiteDriver() {
close();
}
QString OSQLiteDriver::id()const {
return QString::fromLatin1("SQLite");
}
void OSQLiteDriver::setUserName( const QString& ) {}
void OSQLiteDriver::setPassword( const QString& ) {}
void OSQLiteDriver::setUrl( const QString& url ) {
m_url = url;
}
void OSQLiteDriver::setOptions( const QStringList& ) {
}
/*
* Functions to patch a regex search into sqlite
*/
int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){
int res;
if (reg->regex_raw == NULL || (strcmp (zPattern, reg->regex_raw) != 0)){
if (reg->regex_raw != NULL) {
free(reg->regex_raw);
regfree(&reg->regex_c);
}
reg->regex_raw = (char *)malloc(strlen(zPattern)+1);
strncpy(reg->regex_raw, zPattern, strlen(zPattern)+1);
res = regcomp(&reg->regex_c, zPattern, REG_EXTENDED);
if ( res != 0 ) {
printf("Regcomp failed with code %u on string %s\n",res,zPattern);
free(reg->regex_raw);
reg->regex_raw=NULL;
return 0;
}
}
res = (regexec(&reg->regex_c, zString, 0, NULL, 0)==0);
return res;
}
-void rlikeFunc(sqlite_func *context, int arg, const char **argv){
- if( arg < 2 || argv[0]==0 || argv[1]==0 ){
- printf("One of arguments Null!!\n");
- return;
+void rlikeFunc( sqlite3_context* context, int count, sqlite3_value** values ){
+ const unsigned char* argv0 = sqlite3_value_text( values[0] );
+ const unsigned char* argv1 = sqlite3_value_text( values[1] );
+ if( count < 2 || argv0 == 0 || argv1 == 0 ){
+ qWarning( "One of arguments Null!!\n" );
+ return;
}
- sqlite_set_result_int(context,
- sqliteRlikeCompare((const char*)argv[0],
- (const char*)argv[1], (sqregex *)sqlite_user_data(context) ));
+ sqlite3_result_int(context, sqliteRlikeCompare((const char*)argv0,
+ (const char*)argv1,
+ (sqregex *) sqlite3_user_data( context ) ));
}
/*
* try to open a db specified via setUrl
* and options
*/
bool OSQLiteDriver::open() {
- char *error;
-
odebug << "OSQLiteDriver::open: about to open" << oendl;
- m_sqlite = sqlite_open(m_url.local8Bit(),
- 0,
- &error );
+
+ int error = sqlite3_open( m_url.utf8(),
+ &m_sqlite );
/* failed to open */
- if (m_sqlite == 0l ) {
+ if ( error != SQLITE_OK ) {
// FIXME set the last error
owarn << "OSQLiteDriver::open: " << error << "" << oendl;
- free( error );
+ sqlite3_close( m_sqlite );
return false;
}
- if (sqlite_create_function(m_sqlite,"rlike",2,rlikeFunc,&sqreg) != 0)
- odebug << "Unable to create user defined function!" << oendl;
- if (sqlite_function_type(m_sqlite,"rlike",SQLITE_NUMERIC) != 0)
- odebug << "Unable to set rlike function result type!" << oendl;
+ if ( sqlite3_create_function( m_sqlite, "rlike", 2, SQLITE_UTF8, &sqreg, rlikeFunc, NULL, NULL ) != SQLITE_OK ){
+ odebug << "Unable to create user defined function!" << oendl;
+ return false;
+ }
+
sqreg.regex_raw = NULL;
+
return true;
}
/* close the db
* sqlite closes them without
* telling failure or success
*/
bool OSQLiteDriver::close() {
- if (m_sqlite )
- sqlite_close( m_sqlite ), m_sqlite=0l;
- if (sqreg.regex_raw != NULL){
- odebug << "Freeing regex on close" << oendl;
- free(sqreg.regex_raw);
- sqreg.regex_raw=NULL;
- regfree(&sqreg.regex_c);
- }
- return true;
+ if ( m_sqlite ){
+ sqlite3_close( m_sqlite );
+ m_sqlite=0l;
+ }
+ if ( sqreg.regex_raw != NULL){
+ odebug << "Freeing regex on close" << oendl;
+ free( sqreg.regex_raw );
+ sqreg.regex_raw = NULL;
+ regfree( &sqreg.regex_c );
+ }
+ return true;
}
/* Query */
OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
- if ( !m_sqlite ) {
- // FIXME set error code
- OSQLResult result( OSQLResult::Failure );
- return result;
- }
- Query query;
- query.driver = this;
- char *err;
- /* SQLITE_OK 0 if return code > 0 == failure */
- if ( sqlite_exec(m_sqlite, qu->query().utf8(),&call_back, &query, &err) > 0 ) {
- owarn << "OSQLiteDriver::query: Error while executing " << err << "" << oendl;
- free( err );
- // FixMe Errors
- }
-
- OSQLResult result(OSQLResult::Success,
- query.items,
- query.errors );
- return result;
+ if ( !m_sqlite ) {
+ // FIXME set error code
+ OSQLResult result( OSQLResult::Failure );
+ return result;
+ }
+ Query query;
+ query.driver = this;
+ char *err;
+ /* SQLITE_OK 0 if return code > 0 == failure */
+ if ( sqlite3_exec( m_sqlite, qu->query().utf8(), &call_back, &query, &err ) > SQLITE_OK ) {
+ owarn << "OSQLiteDriver::query: Error while executing " << err << "" << oendl;
+ free( err );
+ // FixMe Errors
+ }
+
+ OSQLResult result(OSQLResult::Success,
+ query.items,
+ query.errors );
+ return result;
}
OSQLTable::ValueList OSQLiteDriver::tables() const {
return OSQLTable::ValueList();
}
OSQLError OSQLiteDriver::lastError() {
OSQLError error;
return error;
};
/* handle a callback add the row to the global
* OSQLResultItem
*/
int OSQLiteDriver::handleCallBack( int, char**, char** ) {
return 0;
}
/* callback_handler add the values to the list*/
int OSQLiteDriver::call_back( void* voi, int argc,
- char** argv, char** columns) {
+ char** argv, char** columns ) {
Query* qu = (Query*)voi;
//copy them over to a OSQLResultItem
QMap<QString, QString> tableString;
QMap<int, QString> tableInt;
for (int i = 0; i < argc; i++ ) {
tableInt.insert( i, QString::fromUtf8( argv[i] ) );
tableString.insert( QString::fromUtf8( columns[i] ),
QString::fromUtf8( argv[i] ) );
}
OSQLResultItem item( tableString, tableInt );
qu->items.append( item );
return ((Query*)voi)->driver->handleCallBack( argc,
argv,
columns );
}
}}} // namespace OPIE::DB::Internal
diff --git a/libopie2/opiedb/osqlitedriver.h b/libopie2/opiedb/osqlitedriver.h
index e38fd52..4990a11 100644
--- a/libopie2/opiedb/osqlitedriver.h
+++ b/libopie2/opiedb/osqlitedriver.h
@@ -1,51 +1,51 @@
#ifndef OSQL_LITE_DRIVER_H
#define OSQL_LITE_DRIVER_H
-#include <sqlite.h>
+#include <sqlite3.h>
#include <sys/types.h>
#include <regex.h>
#include "osqldriver.h"
#include "osqlerror.h"
#include "osqlresult.h"
namespace Opie {
namespace DB {
namespace Internal {
struct sqregex {
char *regex_raw;
regex_t regex_c;
};
class OSQLiteDriver : public OSQLDriver {
Q_OBJECT
public:
OSQLiteDriver( QLibrary *lib = 0l );
~OSQLiteDriver();
QString id()const;
void setUserName( const QString& );
void setPassword( const QString& );
void setUrl( const QString& url );
void setOptions( const QStringList& );
bool open();
bool close();
OSQLError lastError();
OSQLResult query( OSQLQuery* );
OSQLTable::ValueList tables()const;
private:
OSQLError m_lastE;
OSQLResult m_result;
OSQLResultItem m_items;
int handleCallBack( int, char**, char** );
static int call_back( void*, int, char**, char** );
QString m_url;
- sqlite *m_sqlite;
+ sqlite3 *m_sqlite;
sqregex sqreg;
};
}
}
}
#endif