From c77cbb0aa1c38cd84e19da72025dbf150641207e Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Wed, 24 Jun 2009 07:10:13 +0100
Subject: [PATCH] Clean up migration database tables

---
 openlp/migration/migratesongs.py   | 13 +++++++++++--
 openlp/plugins/songs/lib/tables.py |  2 --
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/openlp/migration/migratesongs.py b/openlp/migration/migratesongs.py
index 144c1a9ed..400789a57 100644
--- a/openlp/migration/migratesongs.py
+++ b/openlp/migration/migratesongs.py
@@ -117,8 +117,8 @@ class MigrateSongs():
 
     def v_1_9_0(self, database):
         self.display.output(u'Migration 1.9.0 Started for ' + database)
-        self._v1_9_0_old(database)
-        self._v1_9_0_new(database)
+        #self._v1_9_0_old(database)
+        #self._v1_9_0_new(database)
         self._v1_9_0_cleanup(database)
         self.display.output(u'Migration 1.9.0 Finished for ' + database)
 
@@ -175,3 +175,12 @@ class MigrateSongs():
             '(u', ''), ')', ''), '{', ''), '}',''),'?','')
             ;""")
         conn.commit()
+        conn.execute(u'drop table authors_temp;')
+        conn.commit()
+        conn.execute(u'drop table songs_temp;')
+        conn.commit()
+        conn.execute(u'drop table songauthors_temp;')
+        conn.commit()
+        conn.execute(u'drop table settings;')
+
+        conn.commit()
diff --git a/openlp/plugins/songs/lib/tables.py b/openlp/plugins/songs/lib/tables.py
index dea61861f..617c53b7d 100644
--- a/openlp/plugins/songs/lib/tables.py
+++ b/openlp/plugins/songs/lib/tables.py
@@ -73,8 +73,6 @@ Index(u'authors_id',authors_table.c.id)
 Index(u'authors_display_name_id',authors_table.c.display_name, authors_table.c.id)
 Index(u'song_books_id',song_books_table.c.id)
 Index(u'songs_id',songs_table.c.id)
-Index(u'songs_lyrics_id',songs_table.c.search_lyrics, songs_table.c.id)
-Index(u'songs_title_id',songs_table.c.search_title, songs_table.c.id)
 Index(u'topics_id',topics_table.c.id)
 Index(u'authors_songs_author',authors_songs_table.c.author_id, authors_songs_table.c.song_id)
 Index(u'authors_songs_song',authors_songs_table.c.song_id, authors_songs_table.c.author_id)