Merge lp:~ivaldi/midori/endless-user-version into lp:midori

[André Stösel]

fix endless loop in Midori.Database.init

[lp:~ivaldi/midori/endless-user-version]

6411. By André Stösel on 2013-09-22

begin with Update1.sql instead of Update2.sql

[Cris Dywan (kalikiana)]

Nice stuff.

review: Approve

=== modified file 'midori/midori-database.vala'
--- midori/midori-database.vala	2013-09-17 23:39:10 +0000
+++ midori/midori-database.vala	2013-09-22 13:49:02 +0000
@@ -51,30 +51,29 @@
                 db.exec ("PRAGMA synchronous = NORMAL; PRAGMA temp_store = MEMORY;");
             db.exec ("PRAGMA count_changes = OFF;");
 
-            int64 version, user_version;
+            int64 user_version;
             Sqlite.Statement stmt;
             if (db.prepare_v2 ("PRAGMA user_version;", -1, out stmt, null) != Sqlite.OK)
                 throw new DatabaseError.EXECUTE ("Failed to compile statement %s".printf (db.errmsg ()));
             if (stmt.step () != Sqlite.ROW)
                 throw new DatabaseError.EXECUTE ("Failed to get row %s".printf (db.errmsg ()));
-            version = user_version = stmt.column_int64 (0);
+            user_version = stmt.column_int64 (0);
 
-            if (version == 0) {
+            if (user_version == 0) {
                 exec_script ("Create");
-                user_version = version = 1;
+                user_version = 1;
                 exec ("PRAGMA user_version = " + user_version.to_string ());
             }
 
             while (true) {
-                int64 new_version = version + 1;
                 try {
-                    exec_script ("Update" + new_version.to_string ());
+                    exec_script ("Update" + user_version.to_string ());
                 } catch (DatabaseError error) {
                     if (error is DatabaseError.FILENAME)
                         break;
                     throw error;
                 }
-                user_version = new_version;
+                user_version = user_version + 1;
                 exec ("PRAGMA user_version = " + user_version.to_string ());
             }