From 923261c59c90bd54d1da72f6656612a31147ae87 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Thu, 25 Aug 2011 11:22:48 +0200
Subject: [PATCH] Even better, got rid of 'upgrade_schema' function which is
 not really needed.

---
 openlp/core/lib/db.py               |  7 ++++---
 openlp/plugins/songs/lib/db.py      | 12 +-----------
 openlp/plugins/songs/songsplugin.py |  7 ++++---
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py
index 93cd293a5..fab20d36f 100644
--- a/openlp/core/lib/db.py
+++ b/openlp/core/lib/db.py
@@ -142,7 +142,8 @@ class Manager(object):
     """
     Provide generic object persistence management
     """
-    def __init__(self, plugin_name, init_schema, db_file_name=None, upgrade_schema=None):
+    def __init__(self, plugin_name, init_schema, db_file_name=None,
+                 upgrade_mod=None):
         """
         Runs the initialisation process that includes creating the connection
         to the database and the tables if they don't exist.
@@ -181,8 +182,8 @@ class Manager(object):
                 unicode(settings.value(u'db hostname').toString()),
                 unicode(settings.value(u'db database').toString()))
         settings.endGroup()
-        if upgrade_schema:
-            upgrade_schema(self.db_url)
+        if upgrade_mod:
+            upgrade_db(self.db_url, upgrade_mod)
         self.session = init_schema(self.db_url)
 
     def save_object(self, object_instance, commit=True):
diff --git a/openlp/plugins/songs/lib/db.py b/openlp/plugins/songs/lib/db.py
index f37aed29f..bee64b3ba 100644
--- a/openlp/plugins/songs/lib/db.py
+++ b/openlp/plugins/songs/lib/db.py
@@ -32,8 +32,7 @@ the Songs plugin
 from sqlalchemy import Column, ForeignKey, Table, types
 from sqlalchemy.orm import mapper, relation
 
-from openlp.core.lib.db import BaseModel, init_db, upgrade_db
-from openlp.plugins.songs.lib import upgrade
+from openlp.core.lib.db import BaseModel, init_db
 
 class Author(BaseModel):
     """
@@ -71,15 +70,6 @@ class Topic(BaseModel):
     """
     pass
 
-def upgrade_schema(url):
-    """
-    Upgrades the songs database.
-
-    ``url``
-        The database to upgrade
-    """
-    upgrade_db(url, upgrade)
-
 def init_schema(url):
     """
     Setup the songs database connection and initialise the database schema.
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index 9fd113186..f2bf36790 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -36,8 +36,9 @@ from openlp.core.lib import Plugin, StringContent, build_icon, translate, \
 from openlp.core.lib.db import Manager
 from openlp.core.lib.ui import UiStrings, base_action, icon_action
 from openlp.core.utils.actions import ActionList
-from openlp.plugins.songs.lib import clean_song, SongMediaItem, SongsTab
-from openlp.plugins.songs.lib.db import init_schema, upgrade_schema, Song
+from openlp.plugins.songs.lib import clean_song, upgrade, SongMediaItem, \
+    SongsTab
+from openlp.plugins.songs.lib.db import init_schema, Song
 from openlp.plugins.songs.lib.importer import SongFormat
 from openlp.plugins.songs.lib.olpimport import OpenLPSongImport
 
@@ -58,7 +59,7 @@ class SongsPlugin(Plugin):
         Create and set up the Songs plugin.
         """
         Plugin.__init__(self, u'songs', plugin_helpers, SongMediaItem, SongsTab)
-        self.manager = Manager(u'songs', init_schema, upgrade_schema=upgrade_schema)
+        self.manager = Manager(u'songs', init_schema, upgrade_mod=upgrade)
         self.weight = -10
         self.icon_path = u':/plugins/plugin_songs.png'
         self.icon = build_icon(self.icon_path)