summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiedb/osqlbackend.cpp2
-rw-r--r--libopie2/opiedb/osqlitedriver.cpp12
-rw-r--r--libopie2/opiedb/osqlresult.cpp2
-rw-r--r--libopie2/opiedb/osqltable.h2
4 files changed, 10 insertions, 8 deletions
diff --git a/libopie2/opiedb/osqlbackend.cpp b/libopie2/opiedb/osqlbackend.cpp
index aede7c1..5c37480 100644
--- a/libopie2/opiedb/osqlbackend.cpp
+++ b/libopie2/opiedb/osqlbackend.cpp
@@ -64,17 +64,17 @@ void OSQLBackEnd::setVendor( const QString& vendor ) {
}
void OSQLBackEnd::setLicense( const QString & license ) {
m_license = license;
}
void OSQLBackEnd::setLibrary( const QCString& lib ) {
m_lib = lib;
}
void OSQLBackEnd::setDefault( bool def) {
m_default = def;
}
void OSQLBackEnd::setPreference( int pref ) {
m_pref = pref;
}
}
-} \ No newline at end of file
+}
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp
index 92f89cf..c8b560f 100644
--- a/libopie2/opiedb/osqlitedriver.cpp
+++ b/libopie2/opiedb/osqlitedriver.cpp
@@ -23,34 +23,34 @@
  -_. . .   )=.  = Library General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include "osqlquery.h"
#include "osqlitedriver.h"
#include <opie2/odebug.h>
#include <stdlib.h>
#include <stdio.h>
-namespace Opie {
-namespace DB {
+namespace Opie {
+namespace DB {
namespace Internal {
namespace {
struct Query {
OSQLError::ValueList errors;
OSQLResultItem::ValueList items;
OSQLiteDriver *driver;
};
}
OSQLiteDriver::OSQLiteDriver( QLibrary *lib )
: OSQLDriver( lib )
{
m_sqlite = 0l;
}
@@ -91,57 +91,57 @@ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){
}
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( argv[0]==0 || argv[1]==0 ){
+ if( arg < 2 || argv[0]==0 || argv[1]==0 ){
printf("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) ));
}
/*
* try to open a db specified via setUrl
* and options
*/
bool OSQLiteDriver::open() {
char *error;
- odebug << "OSQLiteDriver::open: about to open" << oendl;
+ odebug << "OSQLiteDriver::open: about to open" << oendl;
m_sqlite = sqlite_open(m_url.local8Bit(),
0,
&error );
/* failed to open */
if (m_sqlite == 0l ) {
// FIXME set the last error
- owarn << "OSQLiteDriver::open: " << error << "" << oendl;
+ owarn << "OSQLiteDriver::open: " << error << "" << oendl;
free( error );
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;
sqreg.regex_raw = NULL;
return true;
}
/* close the db
* sqlite closes them without
* telling failure or success
*/
@@ -170,33 +170,33 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
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;
}
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;
}
diff --git a/libopie2/opiedb/osqlresult.cpp b/libopie2/opiedb/osqlresult.cpp
index 268ac8e..a34ab2f 100644
--- a/libopie2/opiedb/osqlresult.cpp
+++ b/libopie2/opiedb/osqlresult.cpp
@@ -58,36 +58,38 @@ QDate OSQLResultItem::dataToDate( const QString& column, bool *ok ) {
QString str = data( column, ok );
if (!str.isEmpty() ) {
;// convert
}
return date;
}
QDate OSQLResultItem::dataToDate( int column, bool *ok ) {
QDate date = QDate::currentDate();
QString str = data( column, ok );
if (!str.isEmpty() ) {
;// convert
}
return date;
}
QDateTime OSQLResultItem::dataToDateTime( const QString& column, bool *ok ) {
+// #FIXME xxx
QDateTime time = QDateTime::currentDateTime();
return time;
}
QDateTime OSQLResultItem::dataToDateTime( int column, bool *ok ) {
+// #FIXME xxx
QDateTime time = QDateTime::currentDateTime();
return time;
}
OSQLResult::OSQLResult( enum State state,
const OSQLResultItem::ValueList& list,
const OSQLError::ValueList& error )
: m_state( state ), m_list( list ), m_error( error )
{
}
OSQLResult::~OSQLResult() {
}
OSQLResult::State OSQLResult::state()const {
return m_state;
diff --git a/libopie2/opiedb/osqltable.h b/libopie2/opiedb/osqltable.h
index 86c30dd..8dd786f 100644
--- a/libopie2/opiedb/osqltable.h
+++ b/libopie2/opiedb/osqltable.h
@@ -57,33 +57,33 @@ private:
OSQLTableItemPrivate* d;
Type m_type;
QString m_field;
QVariant m_var;
};
/**
* A OSQLTable consists of OSQLTableItems
*/
class OSQLTable {
public:
typedef QValueList<OSQLTable> ValueList;
/**
* @param tableName the Name of the Table
*/
- OSQLTable(const QString& tableName);
+ OSQLTable(const QString& tableName = QString::null);
/**
* d'tor
*/
~OSQLTable();
/**
* setColumns sets the Columns of the Table
*/
void setColumns( const OSQLTableItem::ValueList& );
/**
* returns all columns of the table
*/
OSQLTableItem::ValueList columns() const;