diff options
Diffstat (limited to 'src/sql/drivers/sqlite2/qsql_sqlite2.cpp')
-rw-r--r-- | src/sql/drivers/sqlite2/qsql_sqlite2.cpp | 68 |
1 files changed, 39 insertions, 29 deletions
diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp index 3b540fd193..cd449e28e8 100644 --- a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp +++ b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp @@ -77,6 +77,8 @@ static QVariant::Type nameToType(const QString& typeName) class QSQLite2DriverPrivate : public QSqlDriverPrivate { + Q_DECLARE_PUBLIC(QSQLite2Driver) + public: QSQLite2DriverPrivate(); sqlite *access; @@ -93,30 +95,31 @@ class QSQLite2ResultPrivate; class QSQLite2Result : public QSqlCachedResult { + Q_DECLARE_PRIVATE(QSQLite2Result) friend class QSQLite2Driver; - friend class QSQLite2ResultPrivate; + public: explicit QSQLite2Result(const QSQLite2Driver* db); ~QSQLite2Result(); - QVariant handle() const; + QVariant handle() const Q_DECL_OVERRIDE; protected: - bool gotoNext(QSqlCachedResult::ValueCache& row, int idx); - bool reset (const QString& query); - int size(); - int numRowsAffected(); - QSqlRecord record() const; - void detachFromResultSet(); - void virtual_hook(int id, void *data); - -private: - QSQLite2ResultPrivate* d; + bool gotoNext(QSqlCachedResult::ValueCache &row, int idx) Q_DECL_OVERRIDE; + bool reset(const QString &query) Q_DECL_OVERRIDE; + int size() Q_DECL_OVERRIDE; + int numRowsAffected() Q_DECL_OVERRIDE; + QSqlRecord record() const Q_DECL_OVERRIDE; + void detachFromResultSet() Q_DECL_OVERRIDE; + void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; }; -class QSQLite2ResultPrivate +class QSQLite2ResultPrivate: public QSqlCachedResultPrivate { + Q_DECLARE_PUBLIC(QSQLite2Result) + public: - QSQLite2ResultPrivate(QSQLite2Result *res); + Q_DECLARE_SQLDRIVER_PRIVATE(QSQLite2Driver); + QSQLite2ResultPrivate(QSQLite2Result *q, const QSQLite2Driver *drv); void cleanup(); bool fetchNext(QSqlCachedResult::ValueCache &values, int idx, bool initialFetch); bool isSelect(); @@ -124,9 +127,6 @@ public: void init(const char **cnames, int numCols); void finalize(); - QSQLite2Result* q; - sqlite *access; - // and we have too keep our own struct for the data (sqlite works via // callback. const char *currentTail; @@ -134,20 +134,24 @@ public: bool skippedStatus; // the status of the fetchNext() that's skipped bool skipRow; // skip the next fetchNext()? - bool utf8; QSqlRecord rInf; QVector<QVariant> firstRow; }; static const uint initial_cache_size = 128; -QSQLite2ResultPrivate::QSQLite2ResultPrivate(QSQLite2Result* res) : q(res), access(0), currentTail(0), - currentMachine(0), skippedStatus(false), skipRow(false), utf8(false) +QSQLite2ResultPrivate::QSQLite2ResultPrivate(QSQLite2Result *q, const QSQLite2Driver *drv) + : QSqlCachedResultPrivate(q, drv), + currentTail(0), + currentMachine(0), + skippedStatus(false), + skipRow(false) { } void QSQLite2ResultPrivate::cleanup() { + Q_Q(QSQLite2Result); finalize(); rInf.clear(); currentTail = 0; @@ -161,6 +165,7 @@ void QSQLite2ResultPrivate::cleanup() void QSQLite2ResultPrivate::finalize() { + Q_Q(QSQLite2Result); if (!currentMachine) return; @@ -178,6 +183,7 @@ void QSQLite2ResultPrivate::finalize() // called on first fetch void QSQLite2ResultPrivate::init(const char **cnames, int numCols) { + Q_Q(QSQLite2Result); if (!cnames) return; @@ -204,6 +210,7 @@ void QSQLite2ResultPrivate::init(const char **cnames, int numCols) bool QSQLite2ResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, int idx, bool initialFetch) { + Q_Q(QSQLite2Result); // may be caching. const char **fvals; const char **cnames; @@ -250,7 +257,7 @@ bool QSQLite2ResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, int if (idx < 0 && !initialFetch) return true; for (i = 0; i < colNum; ++i) - values[i + idx] = utf8 ? QString::fromUtf8(fvals[i]) : QString::fromLatin1(fvals[i]); + values[i + idx] = drv_d_func()->utf8 ? QString::fromUtf8(fvals[i]) : QString::fromLatin1(fvals[i]); return true; case SQLITE_DONE: if (rInf.isEmpty()) @@ -270,17 +277,14 @@ bool QSQLite2ResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, int } QSQLite2Result::QSQLite2Result(const QSQLite2Driver* db) -: QSqlCachedResult(db) + : QSqlCachedResult(*new QSQLite2ResultPrivate(this, db)) { - d = new QSQLite2ResultPrivate(this); - d->access = db->d_func()->access; - d->utf8 = db->d_func()->utf8; } QSQLite2Result::~QSQLite2Result() { + Q_D(QSQLite2Result); d->cleanup(); - delete d; } void QSQLite2Result::virtual_hook(int id, void *data) @@ -293,6 +297,7 @@ void QSQLite2Result::virtual_hook(int id, void *data) */ bool QSQLite2Result::reset (const QString& query) { + Q_D(QSQLite2Result); // this is where we build a query. if (!driver()) return false; @@ -304,8 +309,8 @@ bool QSQLite2Result::reset (const QString& query) // Um, ok. callback based so.... pass private static function for this. setSelect(false); char *err = 0; - int res = sqlite_compile(d->access, - d->utf8 ? query.toUtf8().constData() + int res = sqlite_compile(d->drv_d_func()->access, + d->drv_d_func()->utf8 ? query.toUtf8().constData() : query.toLatin1().constData(), &(d->currentTail), &(d->currentMachine), @@ -336,6 +341,7 @@ bool QSQLite2Result::reset (const QString& query) bool QSQLite2Result::gotoNext(QSqlCachedResult::ValueCache& row, int idx) { + Q_D(QSQLite2Result); return d->fetchNext(row, idx, false); } @@ -346,11 +352,13 @@ int QSQLite2Result::size() int QSQLite2Result::numRowsAffected() { - return sqlite_changes(d->access); + Q_D(QSQLite2Result); + return sqlite_changes(d->drv_d_func()->access); } QSqlRecord QSQLite2Result::record() const { + Q_D(const QSQLite2Result); if (!isActive() || !isSelect()) return QSqlRecord(); return d->rInf; @@ -358,11 +366,13 @@ QSqlRecord QSQLite2Result::record() const void QSQLite2Result::detachFromResultSet() { + Q_D(QSQLite2Result); d->finalize(); } QVariant QSQLite2Result::handle() const { + Q_D(const QSQLite2Result); return QVariant::fromValue(d->currentMachine); } |