[f-spot] Fix breakage due to Mono.Data.Sqlite not serializing SafeUri.

[Ruben Vermeersch <rubenv src gnome org>]

commit a6fb91220405261161541ea72de69ca546da9eec
Author: Ruben Vermeersch <ruben savanne be>
Date:   Sat May 29 09:12:25 2010 +0200

    Fix breakage due to Mono.Data.Sqlite not serializing SafeUri.

 src/PhotoStore.cs           |   12 ++++++------
 src/QueuedSqliteDatabase.cs |    1 +
 2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/src/PhotoStore.cs b/src/PhotoStore.cs
index afa369b..5a3a732 100644
--- a/src/PhotoStore.cs
+++ b/src/PhotoStore.cs
@@ -154,7 +154,7 @@ public class PhotoStore : DbStore<Photo> {
 					"INSERT INTO photos (time, base_uri, filename, description, roll_id, default_version_id, rating, md5_sum) "	+
 					"VALUES (:time, :base_uri, :filename, :description, :roll_id, :default_version_id, :rating, :md5_sum)",
 	 				"time", unix_time,
-					"base_uri", new_base_uri,
+					"base_uri", new_base_uri.ToString (),
 					"filename", filename,
 	 				"description", description,
 					"roll_id", roll_id,
@@ -325,7 +325,7 @@ public class PhotoStore : DbStore<Photo> {
 			                               " LEFT JOIN photo_versions AS pv ON photos.id = pv.photo_id" +
 			                               " WHERE (photos.base_uri = :base_uri AND photos.filename = :filename)" +
 			                               " OR (pv.base_uri = :base_uri AND pv.filename = :filename)",
-			                               "base_uri", base_uri,
+			                               "base_uri", base_uri.ToString (),
 			                               "filename", filename));
 
 		if (reader.Read ()) {
@@ -493,7 +493,7 @@ public class PhotoStore : DbStore<Photo> {
 					"description", photo.Description,
 					"default_version_id", photo.DefaultVersionId,
 					"time", DbUtils.UnixTimeFromDateTime (photo.Time),
-					"base_uri", photo.VersionUri (Photo.OriginalVersionId).GetBaseUri (),
+					"base_uri", photo.VersionUri (Photo.OriginalVersionId).GetBaseUri ().ToString (),
 					"filename", photo.VersionUri (Photo.OriginalVersionId).GetFilename (),
 					"rating", String.Format ("{0}", photo.Rating),
 					"md5_sum", (photo.MD5Sum != String.Empty ? photo.MD5Sum : null),
@@ -534,7 +534,7 @@ public class PhotoStore : DbStore<Photo> {
 					"photo_id", photo.Id,
 					"version_id", version_id,
 					"name", version.Name,
-			        "base_uri", version.BaseUri,
+			        "base_uri", version.BaseUri.ToString (),
 					"filename", version.Filename,
 					"is_protected", version.IsProtected,
 					"md5_sum", (version.MD5Sum != String.Empty ? version.MD5Sum : null)));
@@ -547,7 +547,7 @@ public class PhotoStore : DbStore<Photo> {
 					"base_uri = :base_uri, filename = :filename, protected = :protected, md5_sum = :md5_sum " +
 					"WHERE photo_id = :photo_id AND version_id = :version_id",
 					"name", version.Name,
-					"base_uri", version.BaseUri,
+					"base_uri", version.BaseUri.ToString (),
 					"filename", version.Filename,
 					"protected", version.IsProtected,
 					"photo_id", photo.Id,
@@ -919,7 +919,7 @@ public class PhotoStore : DbStore<Photo> {
 			"FROM photos " 				+
 			"WHERE base_uri LIKE :base_uri "		+
 			"AND filename LIKE :filename",
-			"base_uri", uri.GetBaseUri (),
+			"base_uri", uri.GetBaseUri ().ToString (),
 			"filename", filename));
 		}
 		
diff --git a/src/QueuedSqliteDatabase.cs b/src/QueuedSqliteDatabase.cs
index 86a387c..a91d155 100644
--- a/src/QueuedSqliteDatabase.cs
+++ b/src/QueuedSqliteDatabase.cs
@@ -391,6 +391,7 @@ namespace Banshee.Database
                 Thread.Sleep(SLEEP_TIME);
                 Execute();
             } catch(Exception e) {
+                Log.Debug ("Broken query: {0}", command.CommandText);
                 execution_exception = e;
                 if (command_type == Banshee.Database.CommandType.ExecuteNonQuery) {
                     throw execution_exception;