factor out the Update() function in CDatabase::Open

Fneufneu · Jul 9, 2012 · fd165ea · fd165ea
1 parent f656311
commit fd165ea
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/xbmc/dbwrappers/Database.cpp b/xbmc/dbwrappers/Database.cpp
@@ -279,6 +279,18 @@ bool CDatabase::Open(const DatabaseSettings &settings)
   if (dbSettings.name.IsEmpty())
     dbSettings.name = GetBaseDBName();
 
+  CStdString dbName = dbSettings.name;
+  dbName.AppendFormat("%d", GetMinVersion());
+  if (!Connect(dbName, dbSettings, false) || GetDBVersion() != GetMinVersion())
+  {
+    if (!Update(dbSettings))
+      return false;
+  }
+  return true;
+}
+
+bool CDatabase::Update(const DatabaseSettings &dbSettings)
+{
   int version = GetMinVersion();
   CStdString latestDb = dbSettings.name;
   latestDb.AppendFormat("%d", version);

diff --git a/xbmc/dbwrappers/Database.h b/xbmc/dbwrappers/Database.h
@@ -114,6 +114,8 @@ class CDatabase
   bool CommitInsertQueries();
 
 protected:
+  bool Update(const DatabaseSettings &db);
+
   void Split(const CStdString& strFileNameAndPath, CStdString& strPath, CStdString& strFileName);
   uint32_t ComputeCRC(const CStdString &text);