mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-06 14:16:32 +02:00
* Some more DatabaseImpl cleanups.
This commit is contained in:
@@ -36,7 +36,6 @@ DatabaseImpl::DatabaseImpl( const QString& dbname, Database* parent )
|
|||||||
}
|
}
|
||||||
|
|
||||||
QSqlQuery qry = QSqlQuery( db );
|
QSqlQuery qry = QSqlQuery( db );
|
||||||
TomahawkSqlQuery query = newquery();
|
|
||||||
|
|
||||||
qry.exec( "SELECT v FROM settings WHERE k='schema_version'" );
|
qry.exec( "SELECT v FROM settings WHERE k='schema_version'" );
|
||||||
if ( qry.next() )
|
if ( qry.next() )
|
||||||
@@ -53,9 +52,7 @@ DatabaseImpl::DatabaseImpl( const QString& dbname, Database* parent )
|
|||||||
qDebug() << endl << "****************************" << endl;
|
qDebug() << endl << "****************************" << endl;
|
||||||
|
|
||||||
qry.clear();
|
qry.clear();
|
||||||
query.clear();
|
|
||||||
qry.finish();
|
qry.finish();
|
||||||
query.finish();
|
|
||||||
|
|
||||||
db.close();
|
db.close();
|
||||||
db.removeDatabase( "tomahawk" );
|
db.removeDatabase( "tomahawk" );
|
||||||
@@ -78,6 +75,7 @@ DatabaseImpl::DatabaseImpl( const QString& dbname, Database* parent )
|
|||||||
updateSchema( 0 );
|
updateSchema( 0 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TomahawkSqlQuery query = newquery();
|
||||||
query.exec( "SELECT v FROM settings WHERE k='dbid'" );
|
query.exec( "SELECT v FROM settings WHERE k='dbid'" );
|
||||||
if( query.next() )
|
if( query.next() )
|
||||||
{
|
{
|
||||||
@@ -141,7 +139,7 @@ DatabaseImpl::updateSchema( int currentver )
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
qDebug() << "Executing:" << s;
|
qDebug() << "Executing:" << s;
|
||||||
TomahawkSqlQuery query;
|
TomahawkSqlQuery query = newquery();
|
||||||
query.exec( s );
|
query.exec( s );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user