banshee r3868 - in trunk/banshee: . src/Libraries/Hyena/Hyena.Query

[gburt svn gnome org]

Author: gburt
Date: Fri May  2 23:54:46 2008
New Revision: 3868
URL: http://svn.gnome.org/viewvc/banshee?rev=3868&view=rev

Log:
2008-05-02  Gabriel Burt  <gabriel burt gmail com>

	* src/Libraries/Hyena/Hyena.Query/QueryField.cs: Fix bug with queries on
	fields that have a custom 'column' (eg maybe they search two different
	columns at once, like MimeTypeField does) not having necessary parenthesis
	around them.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Libraries/Hyena/Hyena.Query/QueryField.cs

Modified: trunk/banshee/src/Libraries/Hyena/Hyena.Query/QueryField.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena/Hyena.Query/QueryField.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena/Hyena.Query/QueryField.cs	Fri May  2 23:54:46 2008
@@ -106,6 +106,11 @@
             this.no_custom_format = (Column.IndexOf ("{0}") == -1 && Column.IndexOf ("{1}") == -1);
             this.column_lowered = (Column.IndexOf ("Lowered") != -1);
 
+            if (!no_custom_format) {
+                // Ensure we have parens around any custom 'columns' that may be an OR of two columns
+                this.column = String.Format ("({0})", this.column);
+            }
+
             foreach (Type value_type in valueTypes) {
                 QueryValue.AddValueType (value_type);
             }