Merge lp:~gue5t/midori/tabby-double into lp:midori

[gue5t gue5t]

clean up handling of double-valued db column in Tabby

Right now, running in a new configuration directory causes Tabby to warn because Midori.Database.Statement.get_double expects the column to be of Sqlite.FLOAT type rather than either that or Sqlite.NULL (which differs from the behavior of other accessors in that namespace).

This changes get_double to return NAN if the column doesn't exist, which fixes the warning.
This commit also simplifies the logic in Tabby, which currently takes a roundabout path through stringification and parsing.

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'extensions/tabby.vala'
--- extensions/tabby.vala	2015-04-19 14:42:11 +0000
+++ extensions/tabby.vala	2015-06-25 04:55:41 +0000
@@ -557,20 +557,15 @@
                     var statement = database.prepare (sqlcmd,
                         ":session_id", typeof (int64), this.id);
                     statement.step ();
-                    double sorting;
-                    string? sorting_string = statement.get_double ("MAX(sorting)").to_string ();
-                    if (sorting_string != null) {
-                        /* we have to use a seperate if condition to avoid
-                           a `possibly unassigned local variable` error */
-                        if (double.try_parse (sorting_string, out sorting)) {
-                            return sorting;
-                        }
+                    double sorting = statement.get_double ("MAX(sorting)");
+                    if (!sorting.is_nan ()) {
+                        return sorting;
                     }
                 } catch (Error error) {
                     critical (_("Failed to select from database: %s"), error.message);
                 }
 
-                 return double.parse ("0");
+                 return 0.0;
             }
 
             internal Session (Midori.Database database) {

=== modified file 'midori/midori-database.vala'
--- midori/midori-database.vala	2015-03-15 16:24:41 +0000
+++ midori/midori-database.vala	2015-06-25 04:55:41 +0000
@@ -121,6 +121,7 @@
 
         /*
          * Get a string value by its named parameter, for example ":uri".
+         * Returns null if not found.
          */
         public string? get_string (string name) throws DatabaseError {
             int index = column_index (name);
@@ -132,6 +133,7 @@
 
         /*
          * Get an integer value by its named parameter, for example ":day".
+         * Returns 0 if not found.
          */
         public int64 get_int64 (string name) throws DatabaseError {
             int index = column_index (name);
@@ -144,12 +146,14 @@
 
         /*
          * Get a double value by its named parameter, for example ":session_id".
+         * Returns double.NAN if not found.
          */
         public double get_double (string name) throws DatabaseError {
             int index = column_index (name);
-            if (stmt.column_type (index) != Sqlite.FLOAT)
+            int type = stmt.column_type (index);
+            if (type != Sqlite.FLOAT && type != Sqlite.NULL)
                 throw new DatabaseError.TYPE ("Getting '%s' with wrong type in row: %s".printf (name, query));
-            return stmt.column_double (index);
+            return type == Sqlite.NULL ? double.NAN : stmt.column_double (index);
         }
     }