Ticket #7539: mythsqlverbose.patch

libs/libmythdb/mythdbcon.h

@@ -26 +26 @@
     bool isOpen(void);
     bool OpenDatabase(void);
     bool KickDatabase(void);
+    QString GetConnectionName(void) { return m_name; }
     QSqlDatabase db(void) { return m_db; }
 
   private:
@@ -112 +113 @@
     /// \brief Wrap QSqlQuery::exec() so we can display SQL
     bool exec(void);
 
+    /// \brief Wrap QSqlQuery::next() so we can display the query results
+    bool next(void);
+
     /// \brief Wrap QSqlQuery::exec(const QString &query) so we can display SQL
     bool exec(const QString &query);
 

libs/libmythdb/mythdbcon.cpp

@@ -10 +10 @@
 #include <QSemaphore>
 #include <QSqlError>
 #include <QSqlField>
+#include <QSqlRecord>
 
 // MythTV
 #include "compat.h"
@@ -443 +444 @@
             str.replace(b.key(), '\'' + b.value().toString() + '\'');
         }
 
-        VERBOSE(VB_DATABASE, "MSqlQuery::exec() \"" + str + '"');
+        VERBOSE(VB_DATABASE, QString("MSqlQuery::exec(%1 \"%2\") - %3 rows")
+            .arg(m_db->MSqlDatabase::GetConnectionName())
+            .arg(str)
+            .arg(QSqlQuery::size()));
     }
 
     return result;
@@ -451 +455 @@
 
 bool MSqlQuery::exec(const QString &query)
 {
-    VERBOSE(VB_DATABASE, "MSqlQuery::exec(\"" + query + "\")");
+    if (print_verbose_messages & VB_DATABASE)
+    {
+        VERBOSE(VB_DATABASE, 
+            QString("MSqlQuery::exec(%1 \"%1\") returned %2 row(s)")
+            .arg(m_db->MSqlDatabase::GetConnectionName())
+            .arg(query)
+            .arg(QSqlQuery::size()));
+    }
 
     return QSqlQuery::exec(query);
 }
 
+bool MSqlQuery::next()
+{
+    bool result = QSqlQuery::next();    
+
+    if ((print_verbose_messages & (VB_DATABASE|VB_EXTRA))
+        == (VB_DATABASE|VB_EXTRA))
+    {
+        if (result) {
+            QString str;
+            QSqlRecord record=QSqlQuery::record();
+
+            for ( long int i = 0; i<record.count(); i++ )
+            {
+                if (!str.isEmpty())
+                {
+                    str.append(", ");
+                }
+                str.append(record.fieldName(i) + " = " + value(i).toString());
+            }
+
+            VERBOSE(VB_EXTRA+VB_DATABASE, QString("MSqlQuery::next(%1) \"%2\"")
+                .arg(m_db->MSqlDatabase::GetConnectionName())
+                .arg(str));
+        }
+    }
+
+    return result;
+}
+
 bool MSqlQuery::prepare(const QString& query)
 {
     QMutexLocker lock(&prepareLock);