From 602373c3e2e425450b107378b43f419d27d21605 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 21 Aug 2019 14:51:46 -0400 Subject: [PATCH] 2019-08-21 Fred Gleason * Added code to dump the parent query to STDERR when an invalid 'RDSqlQuery::value()' is requested. --- ChangeLog | 3 +++ lib/rddb.cpp | 12 ++++++++++++ lib/rddb.h | 1 + 3 files changed, 16 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1a8fd5b9..2105a5ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18932,3 +18932,6 @@ * Removed the '--log-directory=' switch from rdimport(1). * Added an 'ID' column to the list of dropbox configurations in the 'Rivendell Dropbox Configurations; dialog in rdadmin(1). +2019-08-21 Fred Gleason + * Added code to dump the parent query to STDERR when an invalid + 'RDSqlQuery::value()' is requested. diff --git a/lib/rddb.cpp b/lib/rddb.cpp index b41b4e5b..cff9f1fc 100644 --- a/lib/rddb.cpp +++ b/lib/rddb.cpp @@ -95,6 +95,18 @@ int RDSqlQuery::columns() const } +QVariant RDSqlQuery::value(int index) const +{ + QVariant ret=QSqlQuery::value(index); + + if(!ret.isValid()) { + fprintf(stderr,"for query: %s\n\n",(const char *)executedQuery().toUtf8()); + } + + return ret; +} + + QVariant RDSqlQuery::run(const QString &sql,bool *ok) { QVariant ret; diff --git a/lib/rddb.h b/lib/rddb.h index ac648636..f37222f6 100644 --- a/lib/rddb.h +++ b/lib/rddb.h @@ -33,6 +33,7 @@ class RDSqlQuery : public QSqlQuery public: RDSqlQuery(const QString &query = QString::null,bool reconnect=true); int columns() const; + QVariant value(int index) const; static QVariant run(const QString &sql,bool *ok=NULL); static bool apply(const QString &sql,QString *err_msg=NULL); static int rows(const QString &sql);