banshee r3246 - in trunk/banshee: . src/Libraries/Hyena/Hyena.Data.Sqlite

[abock svn gnome org]

Author: abock
Date: Sat Feb 16 21:22:20 2008
New Revision: 3246
URL: http://svn.gnome.org/viewvc/banshee?rev=3246&view=rev

Log:
2008-02-16  Aaron Bockover  <abock gnome org>

    * src/Libraries/Hyena/Hyena.Data.Sqlite/HyenaSqliteConnection.cs: Added
    a necessary null check and return default (T) for the generic Query
    method that Scott introduced - fixes the bug everyone has been complaining
    about



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Libraries/Hyena/Hyena.Data.Sqlite/HyenaSqliteConnection.cs

Modified: trunk/banshee/src/Libraries/Hyena/Hyena.Data.Sqlite/HyenaSqliteConnection.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena/Hyena.Data.Sqlite/HyenaSqliteConnection.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena/Hyena.Data.Sqlite/HyenaSqliteConnection.cs	Sat Feb 16 21:22:20 2008
@@ -212,8 +212,10 @@
         
         public T Query<T> (SqliteCommand command)
         {
-            return (T) SqliteUtils.FromDbFormat (typeof (T),
-                Convert.ChangeType (ExecuteScalar (command), typeof (T)));
+            object result = ExecuteScalar (command);
+            return result == null 
+                ? default (T)
+                : (T)SqliteUtils.FromDbFormat (typeof (T), Convert.ChangeType (result, typeof (T)));
         }
         
         public T Query<T> (HyenaSqliteCommand command)