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

[gburt svn gnome org]

Author: gburt
Date: Tue Mar 11 02:20:20 2008
New Revision: 3412
URL: http://svn.gnome.org/viewvc/banshee?rev=3412&view=rev

Log:
2008-03-10  Gabriel Burt  <gabriel burt gmail com>

	* src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelCache.cs: Fix bug with
	inconsistent table name in SQL.


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

Modified: trunk/banshee/src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelCache.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelCache.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelCache.cs	Tue Mar 11 02:20:20 2008
@@ -100,10 +100,10 @@
             if (model.CachesJoinTableEntries) {
                 select_range_command = new HyenaSqliteCommand (
                     String.Format (@"
-                        SELECT {0}, cache.ItemID  FROM {1}
+                        SELECT {0}, {5}.ItemID  FROM {1}
                             INNER JOIN {2}
                                 ON {3} = {2}.{4}
-                            INNER JOIN {5} cache
+                            INNER JOIN {5}
                                 ON {2}.{6} = {5}.ItemID
                             WHERE
                                 {5}.ModelID = {7} {8}
@@ -135,11 +135,11 @@
             } else {
                 select_range_command = new HyenaSqliteCommand (
                     String.Format (@"
-                        SELECT {0}, cache.ItemID FROM {1}
-                            INNER JOIN {2} cache
-                                ON {3} = cache.ItemID
+                        SELECT {0}, {2}.ItemID FROM {1}
+                            INNER JOIN {2} 
+                                ON {3} = {2}.ItemID
                             WHERE
-                                cache.ModelID = {4} {5}
+                                {2}.ModelID = {4} {5}
                                 {6}
                             LIMIT ?, ?",
                         provider.Select, provider.From, CacheTableName,