-rw-r--r-- | libopie2/opiedb/osqlbackend.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 12 | ||||
-rw-r--r-- | libopie2/opiedb/osqlresult.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiedb/osqltable.h | 2 |
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 @@ -68,13 +68,13 @@ void OSQLBackEnd::setLicense( const QString & 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 @@ -27,26 +27,26 @@ 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 ) @@ -95,49 +95,49 @@ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){ 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(®->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; } @@ -174,25 +174,25 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { 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 */ 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 @@ -62,28 +62,30 @@ QDate OSQLResultItem::dataToDate( const QString& column, bool *ok ) { 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() { 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 @@ -61,25 +61,25 @@ private: }; /** * 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& ); /** |