diff options
| author | Jonathan Marshall <jmarshall@never.you.mind> | 2011-02-26 14:54:44 +1300 |
|---|---|---|
| committer | Jonathan Marshall <jmarshall@never.you.mind> | 2011-02-26 19:54:12 +1300 |
| commit | c67d8cfcd55da7721066daa59c693df78639f269 (patch) | |
| tree | ecf56f1d3edf1108fe8f3b7f7481a63f1b2ae2ad | |
| parent | 94db0e7a91e5f8e3e71dd22dd158e73660eb6e4f (diff) | |
don't allow custom names for sqlite databases, as we'll use the name in the future for different database versions.
force <name> for mysql installs
| -rw-r--r-- | xbmc/dbwrappers/Database.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/xbmc/dbwrappers/Database.cpp b/xbmc/dbwrappers/Database.cpp index 4cf9c1c29d..838fe1497b 100644 --- a/xbmc/dbwrappers/Database.cpp +++ b/xbmc/dbwrappers/Database.cpp @@ -262,21 +262,19 @@ bool CDatabase::Open(DatabaseSettings &dbSettings) if ( dbSettings.type.Equals("mysql") ) { // check we have all information before we cancel the fallback - if ( ! (dbSettings.host.IsEmpty() || dbSettings.user.IsEmpty() || dbSettings.pass.IsEmpty()) ) + if ( ! (dbSettings.host.IsEmpty() || dbSettings.name.IsEmpty() || + dbSettings.user.IsEmpty() || dbSettings.pass.IsEmpty()) ) m_sqlite = false; else - CLog::Log(LOGINFO, "essential mysql database information is missing (eg. host, user, pass)"); + CLog::Log(LOGINFO, "essential mysql database information is missing (eg. host, name, user, pass)"); } - // set default database name if appropriate - if ( dbSettings.name.IsEmpty() ) - dbSettings.name = GetDefaultDBName(); - // always safely fallback to sqlite3 if (m_sqlite) { dbSettings.type = "sqlite3"; dbSettings.host = _P(g_settings.GetDatabaseFolder()); + dbSettings.name = GetDefaultDBName(); } if (Connect(dbSettings, true) && UpdateVersion(dbSettings.name)) |