From ae3466187ae34c31a7b86cda412deb8c6180ea1c Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi.hannula@iki.fi>
Date: Sat, 18 Dec 2010 20:28:13 +0200
Subject: [PATCH] changed: use the legacy pvr-testing2 addon database

Use Addons2 database instead of Addons database. This ensures backward
compatibility from pvr-testing2 branch and prevents conflicts by future
db changes in trunk.
---
 xbmc/AddonDatabase.cpp |    6 +++---
 xbmc/AddonDatabase.h   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xbmc/AddonDatabase.cpp b/xbmc/AddonDatabase.cpp
index 3426ec8..4aeb5dc 100644
--- a/xbmc/AddonDatabase.cpp
+++ b/xbmc/AddonDatabase.cpp
@@ -152,12 +152,12 @@ bool CAddonDatabase::UpdateOldVersion(int version)
     }
     if (version < 12)
     {
-      m_pDS->exec("alter table addon add disclaimer text");
+      m_pDS->exec("CREATE TABLE pvrenabled (id integer primary key, addonID text)\n");
+      m_pDS->exec("CREATE INDEX idxPVREnabled ON pvrenabled(addonID)");
     }
     if (version < 13)
     {
-      m_pDS->exec("CREATE TABLE pvrenabled (id integer primary key, addonID text)\n");
-      m_pDS->exec("CREATE INDEX idxPVREnabled ON pvrenabled(addonID)");
+      m_pDS->exec("alter table addon add disclaimer text");
     }
   }
   catch (...)
diff --git a/xbmc/AddonDatabase.h b/xbmc/AddonDatabase.h
index deb557d..66f6599 100644
--- a/xbmc/AddonDatabase.h
+++ b/xbmc/AddonDatabase.h
@@ -115,6 +115,6 @@ protected:
   virtual bool CreateTables();
   virtual bool UpdateOldVersion(int version);
   virtual int GetMinVersion() const { return 13; }
-  const char *GetDefaultDBName() const { return "Addons"; }
+  const char *GetDefaultDBName() const { return "Addons2"; }
 };
 
-- 
1.7.3