mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-02 12:20:45 +02:00
Code Issues Releases Wiki Activity

* Reuse precalculated connection name.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-06-06 16:02:49 +02:00
parent 28e15122ea
commit 2dc73d04af
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libtomahawk/database/DatabaseImpl.cpp
View File

@@ -742,7 +742,7 @@ DatabaseImpl::openDatabase( const QString& dbname, bool checkSchema )
if ( version > 0 && version != CURRENT_SCHEMA_VERSION ) if ( version > 0 && version != CURRENT_SCHEMA_VERSION )
{ {
QSqlDatabase::removeDatabase( "tomahawk" ); QSqlDatabase::removeDatabase( connName );
QString newname = QString( "%1.v%2" ).arg( dbname ).arg( version ); QString newname = QString( "%1.v%2" ).arg( dbname ).arg( version );
tLog() << endl << "****************************" << endl; tLog() << endl << "****************************" << endl;
@@ -753,7 +753,7 @@ DatabaseImpl::openDatabase( const QString& dbname, bool checkSchema )
QFile::copy( dbname, newname ); QFile::copy( dbname, newname );
{ {
m_db = QSqlDatabase::addDatabase( "QSQLITE", "tomahawk" ); m_db = QSqlDatabase::addDatabase( "QSQLITE", connName );
m_db.setDatabaseName( dbname ); m_db.setDatabaseName( dbname );
if ( !m_db.open() ) if ( !m_db.open() )
throw "db moving failed"; throw "db moving failed";