Fix TWK-1616

src/libtomahawk/database/DatabaseCommand_AddSource.cpp

@@ -59,7 +59,7 @@ DatabaseCommand_addSource::exec( DatabaseImpl* dbi )
     query.prepare( "INSERT INTO source(name, friendlyname, isonline) VALUES(?,?,?)" );
     query.addBindValue( m_username );
     query.addBindValue( m_fname );
-    query.addBindValue( true );
+    query.addBindValue( "true" );
     query.exec();
 
     unsigned int id = query.lastInsertId().toUInt();

src/libtomahawk/database/DatabaseCommand_CreateDynamicPlaylist.cpp

@@ -40,7 +40,7 @@ DatabaseCommand_CreateDynamicPlaylist::DatabaseCommand_CreateDynamicPlaylist( QO
     : DatabaseCommand_CreatePlaylist( parent )
     , m_autoLoad( true )
 {
-    tDebug() << Q_FUNC_INFO << "creating dynamiccreatecommand 1";
+    tLog( LOGVERBOSE ) << Q_FUNC_INFO << "creating dynamiccreatecommand 1";
 }
 
 
@@ -50,7 +50,7 @@ DatabaseCommand_CreateDynamicPlaylist::DatabaseCommand_CreateDynamicPlaylist( co
     , m_playlist( playlist )
     , m_autoLoad( autoLoad )
 {
-    tDebug() << Q_FUNC_INFO << "creating dynamiccreatecommand 2";
+    tLog( LOGVERBOSE ) << Q_FUNC_INFO << "creating dynamiccreatecommand 2";
 }
 
 DatabaseCommand_CreateDynamicPlaylist::~DatabaseCommand_CreateDynamicPlaylist()
@@ -68,14 +68,13 @@ DatabaseCommand_CreateDynamicPlaylist::playlistV() const
 void
 DatabaseCommand_CreateDynamicPlaylist::exec( DatabaseImpl* lib )
 {
-    qDebug() << Q_FUNC_INFO;
     Q_ASSERT( !( m_playlist.isNull() && m_v.isNull() ) );
     Q_ASSERT( !source().isNull() );
 
     DatabaseCommand_CreatePlaylist::createPlaylist( lib, true );
-    qDebug() << "Created normal playlist, now creating additional dynamic info!";
+    tLog( LOGVERBOSE ) << Q_FUNC_INFO << "Created normal playlist, now creating additional dynamic info!";
 
-    qDebug() << "Create dynamic execing!" << m_playlist << m_v;
+    tLog( LOGVERBOSE ) << Q_FUNC_INFO <<  "Create dynamic execing!" << m_playlist << m_v;
     TomahawkSqlQuery cre = lib->newquery();
 
     cre.prepare( "INSERT INTO dynamic_playlist( guid, pltype, plmode, autoload ) "
@@ -91,7 +90,7 @@ DatabaseCommand_CreateDynamicPlaylist::exec( DatabaseImpl* lib )
         cre.addBindValue( m_playlist->type() );
         cre.addBindValue( m_playlist->mode() );
     }
-    cre.addBindValue( m_autoLoad );
+    cre.addBindValue( m_autoLoad ? "true" : "false" );
     cre.exec();
 }
 
@@ -99,17 +98,16 @@ DatabaseCommand_CreateDynamicPlaylist::exec( DatabaseImpl* lib )
 void
 DatabaseCommand_CreateDynamicPlaylist::postCommitHook()
 {
-    qDebug() << Q_FUNC_INFO;
     if ( source().isNull() || source()->dbCollection().isNull() )
     {
-        qDebug() << "Source has gone offline, not emitting to GUI.";
+        tDebug() << "Source has gone offline, not emitting to GUI.";
         return;
     }
 
     if(  !DatabaseCommand_CreatePlaylist::report() || report() == false )
         return;
 
-    qDebug() << Q_FUNC_INFO << "..reporting..";
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "..reporting..";
     if( m_playlist.isNull() ) {
         QMetaObject::invokeMethod( SourceList::instance(),
                                    "createDynamicPlaylist",

src/libtomahawk/database/DatabaseCommand_CreatePlaylist.cpp

@@ -117,12 +117,12 @@ DatabaseCommand_CreatePlaylist::createPlaylist( DatabaseImpl* lib, bool dynamic)
                  "VALUES( :guid, :source, :shared, :title, :info, :creator, :lastmodified, :dynplaylist, :createdOn )" );
 
     cre.bindValue( ":source", source()->isLocal() ? QVariant(QVariant::Int) : source()->id() );
-    cre.bindValue( ":dynplaylist", dynamic );
+    cre.bindValue( ":dynplaylist", dynamic ? "true" : "false" );
     cre.bindValue( ":createdOn", now );
     if ( !m_playlist.isNull() )
     {
         cre.bindValue( ":guid", m_playlist->guid() );
-        cre.bindValue( ":shared", m_playlist->shared() );
+        cre.bindValue( ":shared", m_playlist->shared() ? "true" : "false" );
         cre.bindValue( ":title", m_playlist->title() );
         cre.bindValue( ":info", m_playlist->info() );
         cre.bindValue( ":creator", m_playlist->creator() );

src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.h

@@ -76,6 +76,7 @@ public:
     void setType( const QString& type ) { m_type = type; }
     void setMode( int mode ) { m_mode = (GeneratorMode)mode; }
 
+    // TODO: Pass wptr here, so we can get a strong reference again
     void setPlaylist( DynamicPlaylist* pl ); // raw pointer b/c we don't have the shared pointer from inside the shared pointer
 
 private:

src/libtomahawk/database/DatabaseWorker.cpp

@@ -276,40 +276,39 @@ void
 DatabaseWorker::logOp( DatabaseCommandLoggable* command )
 {
     TomahawkSqlQuery oplogquery = Database::instance()->impl()->newquery();
-    qDebug() << "INSERTING INTO OPLOG:" << command->source()->id() << command->guid() << command->commandname();
+    tLog( LOGVERBOSE ) << "INSERTING INTO OPLOG:" << command->source()->id() << command->guid() << command->commandname();
     oplogquery.prepare( "INSERT INTO oplog(source, guid, command, singleton, compressed, json) "
                         "VALUES(?, ?, ?, ?, ?, ?)" );
 
     QVariantMap variant = TomahawkUtils::qobject2qvariant( command );
     QByteArray ba = TomahawkUtils::toJson( variant );
 
-//     qDebug() << "OP JSON:" << ba.isNull() << ba << "from:" << variant; // debug
-
     bool compressed = false;
     if ( ba.length() >= 512 )
     {
         // We need to compress this in this thread, since inserting into the log
         // has to happen as part of the same transaction as the dbcmd.
         // (we are in a worker thread for RW dbcmds anyway, so it's ok)
-        //qDebug() << "Compressing DB OP JSON, uncompressed size:" << ba.length();
         ba = qCompress( ba, 9 );
         compressed = true;
-        //qDebug() << "Compressed DB OP JSON size:" << ba.length();
     }
 
     if ( command->singletonCmd() )
     {
-        tDebug() << "Singleton command, deleting previous oplog commands";
+        tLog( LOGVERBOSE ) << "Singleton command, deleting previous oplog commands";
 
         TomahawkSqlQuery oplogdelquery = Database::instance()->impl()->newquery();
-        oplogdelquery.prepare( QString( "DELETE FROM oplog WHERE source %1 AND singleton = 'true' AND command = ?" )
+        oplogdelquery.prepare( QString( "DELETE FROM oplog WHERE "
+                                        "source %1 "
+                                        "AND (singleton = 'true' or singleton = 1) "
+                                        "AND command = ?" )
                                   .arg( command->source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( command->source()->id() ) ) );
 
         oplogdelquery.bindValue( 0, command->commandname() );
         oplogdelquery.exec();
     }
 
-    tDebug() << "Saving to oplog:" << command->commandname()
+    tLog( LOGVERBOSE ) << "Saving to oplog:" << command->commandname()
              << "bytes:" << ba.length()
              << "guid:" << command->guid();
 
@@ -317,8 +316,8 @@ DatabaseWorker::logOp( DatabaseCommandLoggable* command )
                           QVariant(QVariant::Int) : command->source()->id() );
     oplogquery.bindValue( 1, command->guid() );
     oplogquery.bindValue( 2, command->commandname() );
-    oplogquery.bindValue( 3, command->singletonCmd() );
+    oplogquery.bindValue( 3, command->singletonCmd() ? "true" : "false" );
-    oplogquery.bindValue( 4, compressed );
+    oplogquery.bindValue( 4, compressed ? "true" : "false" );
     oplogquery.bindValue( 5, ba );
     if ( !oplogquery.exec() )
     {