From 6fc4f2a89a77abbadd6cb215d9a363387cbb2be5 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Tue, 26 Jun 2012 04:03:03 +0200
Subject: [PATCH] * Auto re-prepare query on weird 'no query' error.

---
 src/libtomahawk/database/TomahawkSqlQuery.cpp | 20 ++++++++++++++++---
 src/libtomahawk/database/TomahawkSqlQuery.h   |  6 ++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/libtomahawk/database/TomahawkSqlQuery.cpp b/src/libtomahawk/database/TomahawkSqlQuery.cpp
index 8bc9df546..47471c749 100644
--- a/src/libtomahawk/database/TomahawkSqlQuery.cpp
+++ b/src/libtomahawk/database/TomahawkSqlQuery.cpp
@@ -51,6 +51,14 @@ TomahawkSqlQuery::escape( QString identifier )
 }
 
 
+bool
+TomahawkSqlQuery::prepare( const QString& query )
+{
+    m_query = query;
+    return QSqlQuery::prepare( query );
+}
+
+
 bool
 TomahawkSqlQuery::exec( const QString& query )
 {
@@ -76,6 +84,12 @@ TomahawkSqlQuery::exec()
     unsigned int retries = 0;
     while ( !QSqlQuery::exec() && ++retries < 10 )
     {
+        if ( lastError().text().toLower().contains( "no query" ) )
+        {
+            tDebug() << Q_FUNC_INFO << "Re-preparing query!";
+            prepare( m_query );
+        }
+
         if ( isBusyError( lastError() ) )
             retries = 0;
 
@@ -104,7 +118,7 @@ TomahawkSqlQuery::commitTransaction()
 #endif
     if ( log )
         tLog( LOGSQL ) << "TomahawkSqlQuery::commitTransaction running in thread " << QThread::currentThread();
-    
+
     unsigned int retries = 0;
     while ( !m_db.commit() && ++retries < 10 )
     {
@@ -114,7 +128,7 @@ TomahawkSqlQuery::commitTransaction()
         tDebug() << "INFO: Retrying failed commit:" << retries << lastError().text();
         TomahawkUtils::msleep( 10 );
     }
-    
+
     return ( retries < 10 );
 }
 
@@ -136,5 +150,5 @@ TomahawkSqlQuery::isBusyError( const QSqlError& error ) const
 {
     const QString text = error.text().trimmed().toLower();
 
-    return ( text.contains( "no query" ) || text.contains( "locked" ) || text.contains( "busy" ) || text.isEmpty() );
+    return ( text.contains( "locked" ) || text.contains( "busy" ) || text.isEmpty() );
 }
diff --git a/src/libtomahawk/database/TomahawkSqlQuery.h b/src/libtomahawk/database/TomahawkSqlQuery.h
index 4695e33bf..02f69cb0f 100644
--- a/src/libtomahawk/database/TomahawkSqlQuery.h
+++ b/src/libtomahawk/database/TomahawkSqlQuery.h
@@ -35,17 +35,19 @@ public:
 
     static QString escape( QString identifier );
 
+    bool prepare( const QString& query );
     bool exec( const QString& query );
     bool exec();
-    
+
     bool commitTransaction();
 
 private:
     bool isBusyError( const QSqlError& error ) const;
 
     void showError();
-    
+
     QSqlDatabase m_db;
+    QString m_query;
 };
 
 #endif // TOMAHAWKSQLQUERY_H