f-spot r4518 - in trunk: . src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Sat Oct 18 11:02:01 2008
New Revision: 4518
URL: http://svn.gnome.org/viewvc/f-spot?rev=4518&view=rev

Log:
2008-10-18  Stephane Delcroix  <sdelcroix novell com>

	* src/Updater.cs: fix the upgrade for he ones who tested early versions
	of some patches.

Modified:
   trunk/ChangeLog
   trunk/src/Updater.cs

Modified: trunk/src/Updater.cs
==============================================================================
--- trunk/src/Updater.cs	(original)
+++ trunk/src/Updater.cs	Sat Oct 18 11:02:01 2008
@@ -413,7 +413,7 @@
 					"       UNIQUE (photo_id, tag_id)\n" +
 					")");
 				Execute (String.Format (
-					"INSERT INTO photo_tags (photo_id, tag_id) " +
+					"INSERT OR IGNORE INTO photo_tags (photo_id, tag_id) " +
 					"SELECT photo_id, tag_id " +
 					"FROM {0}", temp_table));
 
@@ -429,7 +429,7 @@
 					"	UNIQUE (photo_id, version_id)\n" +
 					")");
 				Execute (String.Format (
-					"INSERT INTO photo_versions (photo_id, version_id, name, uri, md5_sum, protected) " +
+					"INSERT OR IGNORE INTO photo_versions (photo_id, version_id, name, uri, md5_sum, protected) " +
 					"SELECT photo_id, version_id, name, uri, md5_sum, protected " +
 					"FROM {0}", temp_table));