-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 | |||
@@ -77,4 +77,4 @@ void OSQLBackEnd::setPreference( int pref ) { | |||
77 | 77 | ||
78 | 78 | ||
79 | } | 79 | } |
80 | } \ No newline at end of file | 80 | } |
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 | |||
@@ -36,8 +36,8 @@ | |||
36 | #include <stdlib.h> | 36 | #include <stdlib.h> |
37 | #include <stdio.h> | 37 | #include <stdio.h> |
38 | 38 | ||
39 | namespace Opie { | 39 | namespace Opie { |
40 | namespace DB { | 40 | namespace DB { |
41 | namespace Internal { | 41 | namespace Internal { |
42 | 42 | ||
43 | namespace { | 43 | namespace { |
@@ -104,7 +104,7 @@ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){ | |||
104 | } | 104 | } |
105 | 105 | ||
106 | void rlikeFunc(sqlite_func *context, int arg, const char **argv){ | 106 | void rlikeFunc(sqlite_func *context, int arg, const char **argv){ |
107 | if( argv[0]==0 || argv[1]==0 ){ | 107 | if( arg < 2 || argv[0]==0 || argv[1]==0 ){ |
108 | printf("One of arguments Null!!\n"); | 108 | printf("One of arguments Null!!\n"); |
109 | return; | 109 | return; |
110 | } | 110 | } |
@@ -120,7 +120,7 @@ void rlikeFunc(sqlite_func *context, int arg, const char **argv){ | |||
120 | bool OSQLiteDriver::open() { | 120 | bool OSQLiteDriver::open() { |
121 | char *error; | 121 | char *error; |
122 | 122 | ||
123 | odebug << "OSQLiteDriver::open: about to open" << oendl; | 123 | odebug << "OSQLiteDriver::open: about to open" << oendl; |
124 | m_sqlite = sqlite_open(m_url.local8Bit(), | 124 | m_sqlite = sqlite_open(m_url.local8Bit(), |
125 | 0, | 125 | 0, |
126 | &error ); | 126 | &error ); |
@@ -128,7 +128,7 @@ bool OSQLiteDriver::open() { | |||
128 | /* failed to open */ | 128 | /* failed to open */ |
129 | if (m_sqlite == 0l ) { | 129 | if (m_sqlite == 0l ) { |
130 | // FIXME set the last error | 130 | // FIXME set the last error |
131 | owarn << "OSQLiteDriver::open: " << error << "" << oendl; | 131 | owarn << "OSQLiteDriver::open: " << error << "" << oendl; |
132 | free( error ); | 132 | free( error ); |
133 | return false; | 133 | return false; |
134 | } | 134 | } |
@@ -183,7 +183,7 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { | |||
183 | 183 | ||
184 | 184 | ||
185 | OSQLTable::ValueList OSQLiteDriver::tables() const { | 185 | OSQLTable::ValueList OSQLiteDriver::tables() const { |
186 | 186 | return OSQLTable::ValueList(); | |
187 | } | 187 | } |
188 | 188 | ||
189 | 189 | ||
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 | |||
@@ -71,10 +71,12 @@ QDate OSQLResultItem::dataToDate( int column, bool *ok ) { | |||
71 | 71 | ||
72 | } | 72 | } |
73 | QDateTime OSQLResultItem::dataToDateTime( const QString& column, bool *ok ) { | 73 | QDateTime OSQLResultItem::dataToDateTime( const QString& column, bool *ok ) { |
74 | // #FIXME xxx | ||
74 | QDateTime time = QDateTime::currentDateTime(); | 75 | QDateTime time = QDateTime::currentDateTime(); |
75 | return time; | 76 | return time; |
76 | } | 77 | } |
77 | QDateTime OSQLResultItem::dataToDateTime( int column, bool *ok ) { | 78 | QDateTime OSQLResultItem::dataToDateTime( int column, bool *ok ) { |
79 | // #FIXME xxx | ||
78 | QDateTime time = QDateTime::currentDateTime(); | 80 | QDateTime time = QDateTime::currentDateTime(); |
79 | return time; | 81 | return time; |
80 | } | 82 | } |
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 | |||
@@ -70,7 +70,7 @@ public: | |||
70 | /** | 70 | /** |
71 | * @param tableName the Name of the Table | 71 | * @param tableName the Name of the Table |
72 | */ | 72 | */ |
73 | OSQLTable(const QString& tableName); | 73 | OSQLTable(const QString& tableName = QString::null); |
74 | 74 | ||
75 | /** | 75 | /** |
76 | * d'tor | 76 | * d'tor |