Merge lp:~ahayzen/music-app/fix-1411113-db-locking into lp:music-app/remix

[Andrew Hayzen]

* Clear from the recent table instead of dropping when clearing

* Clear from the recent table instead of dropping when clearing

Instead of dropping and rebuilding the table each time, delete all the records. Also change the startup process so that there is less duplication of calls (used to call CREATE TABLE IF NOT EXISTS twice for an upgrade), now it is always once.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:784
http://91.189.93.70:8080/job/music-app-ci/1214/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/692
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/692/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/66

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1214/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Thanks, this fixes the issue! Nice work!

review: Approve

=== modified file 'meta-database.js'
--- meta-database.js	2015-01-11 18:44:18 +0000
+++ meta-database.js	2015-01-15 20:17:55 +0000
@@ -207,14 +207,14 @@
     var db = getDatabase();
     db.transaction(
         function(tx) {
-            // Data is either the playlist name or album name
-            tx.executeSql("CREATE TABLE IF NOT EXISTS recent(time DATETIME UNIQUE, data TEXT, type TEXT)");
-
-            // Check of old version of db and then clear if needed
+            // Check of old version of db (or no db) then clear and rebuild if needed
             try {
                 tx.executeSql("SELECT data FROM recent");
             } catch (e) {
-                clearRecentHistory();
+                tx.executeSql('DROP TABLE IF EXISTS recent');
+
+                // Data is either the playlist name or album name
+                tx.executeSql("CREATE TABLE IF NOT EXISTS recent(time DATETIME UNIQUE, data TEXT, type TEXT)");
             }
       });
 }
@@ -223,8 +223,7 @@
     var db = getDatabase();
     db.transaction(
         function(tx) {
-            tx.executeSql('DROP TABLE IF EXISTS recent');
-            tx.executeSql("CREATE TABLE IF NOT EXISTS recent(time DATETIME UNIQUE, data TEXT, type TEXT)");
+            tx.executeSql('DELETE FROM recent');
       });
 }