Fixed a bug where set couldn't be used with __in. Thanks to Kronuz for the report!

Author: toastdriven

haystack/backends/solr_backend.py

@@ -372,7 +372,7 @@ def build_query_fragment(self, field, filter_type, value):
         if hasattr(value, 'values_list'):
             value = list(value)
 
-        if not isinstance(value, (list, tuple)):
+        if not isinstance(value, (set, list, tuple)):
             # Convert whatever we find to what pysolr wants.
             value = self.backend.conn._from_python(value)
 

tests/solr_tests/tests/solr_query.py

@@ -76,6 +76,11 @@ def test_build_query_in_filter_datetime(self):
         self.sq.add_filter(SQ(pub_date__in=[datetime.datetime(2009, 7, 6, 1, 56, 21)]))
         self.assertEqual(self.sq.build_query(), u'(why AND (pub_date:"2009-07-06T01:56:21Z"))')
 
+    def test_build_query_in_with_set(self):
+        self.sq.add_filter(SQ(content='why'))
+        self.sq.add_filter(SQ(title__in=set(["A Famous Paper", "An Infamous Article"])))
+        self.assertEqual(self.sq.build_query(), u'(why AND (title:"A Famous Paper" OR title:"An Infamous Article"))')
+    
     def test_build_query_wildcard_filter_types(self):
         self.sq.add_filter(SQ(content='why'))
         self.sq.add_filter(SQ(title__startswith='haystack'))

tests/whoosh_tests/tests/whoosh_query.py

@@ -82,6 +82,11 @@ def test_build_query_in_filter_datetime(self):
         self.sq.add_filter(SQ(pub_date__in=[datetime.datetime(2009, 7, 6, 1, 56, 21)]))
         self.assertEqual(self.sq.build_query(), u'(why AND (pub_date:"20090706015621"))')
 
+    def test_build_query_in_with_set(self):
+        self.sq.add_filter(SQ(content='why'))
+        self.sq.add_filter(SQ(title__in=set(["A Famous Paper", "An Infamous Article"])))
+        self.assertEqual(self.sq.build_query(), u'(why AND (title:"A Famous Paper" OR title:"An Infamous Article"))')
+    
     def test_build_query_wildcard_filter_types(self):
         self.sq.add_filter(SQ(content='why'))
         self.sq.add_filter(SQ(title__startswith='haystack'))