Merge lp:~rpadovani/ubuntu-calculator-app/dbupgrade into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Riccardo Padovani]

Created a new function to upgrade database and avoid problems adding new version of db

Created a new function to upgrade database and avoid problems adding new version of db

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

PASSED: Continuous integration, rev:119
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/61/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/53
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/61
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/61
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/53

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/61/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good! Thanks for the fix.

review: Approve

=== modified file 'Storage.qml'
--- Storage.qml	2013-07-30 17:06:03 +0000
+++ Storage.qml	2013-08-07 18:03:32 +0000
@@ -21,29 +21,58 @@
 import "./dateutils.js" as DateUtils
 
 Item {
-
     property var db: null
 
     function openDB() {
         if(db !== null) return;
 
         db = LocalStorage.openDatabaseSync("ubuntu-calculator-app", "", "Default Ubuntu touch calculator", 100000);
-
-        if (db.version == "") {
-            db.changeVersion("", "0.1",
-                function(tx) {
-                    tx.executeSql('CREATE TABLE IF NOT EXISTS Calculations(id INTEGER PRIMARY KEY, calc TEXT)');
-                    console.log('Database created');
-                });
-        }
-
-        if (db.version == "0.1") {
-            db.changeVersion("0.1", "0.1.1",
-                function(tx) {
-                    tx.executeSql('ALTER TABLE Calculations ADD insertDate INTEGER NOT NULL DEFAULT 0');
-                    console.log('Database upgraded to 0.1.1');
-                });
-        }
+        upgradeDB(db.version);
+    }
+
+    /* We need this function because db.version is in the .ini file, that is update only by Javascript Garbage Collection.
+     * So, we have to upgrade from actual version to the last version using only once db.changeVersion.
+     * To avoid to have a lot of switch and spaghetti-code, this function allow to add new db version without modify old sql
+     *
+     * IMPORTANT: NUMBER OF VERSION HAVE TO BE INT (e.g. 0.1, not 0.1.1)
+     */
+    function upgradeDB() {
+        // This is the array with all the sql code, insert your update at the last
+        var sqlcode = [
+            'CREATE TABLE IF NOT EXISTS Calculations(id INTEGER PRIMARY KEY, calc TEXT)',
+            'ALTER TABLE Calculations ADD insertDate INTEGER NOT NULL DEFAULT 0'
+        ]
+
+        // This is the last version of the DB, remember to update when you insert a new version
+        var lastVersion = "0.2";
+
+        // Hack for change old numeration with new one
+        if (db.version == "0.1.1") {
+            db.changeVersion("0.1.1", "0.2");
+            console.log("Fixed DB!");
+        }
+
+        // So, let's start the version change...
+        db.changeVersion(db.version, lastVersion,
+            function(tx) {
+                if (db.version < 0.1) {
+                    tx.executeSql(sqlcode[0]);
+                    console.log('Database upgraded to 0.1');
+                }
+                if (db.version < 0.2) {
+                    tx.executeSql(sqlcode[1]);
+                    console.log('Database upgraded to 0.2');
+                }
+                
+                /* This is the structure of the update:
+                 * n is the number of version that sql update to
+                 * m is the number of the sql element in the array. Remember that the number of the first element of array is 0 ;)
+                if (db.version < n) {
+                    tx.executeSql(sqlcode[m]);
+                    console.log('Database upgraded to n');
+                }
+                */
+            }); // Finish db.changeVersion
     }
 
     function getCalculations(callback){