Fixed a bug so that ValuesListQuerySet now works with the __in filter. Thanks to jcdyer for the report!

Author: toastdriven

haystack/backends/solr_backend.py

@@ -380,6 +380,10 @@ def matching_all_fragment(self):
     def build_query_fragment(self, field, filter_type, value):
         result = ''
 
+        # Handle when we've got a ``ValuesListQuerySet``...
+        if hasattr(value, 'values_list'):
+            value = list(value)
+        
         if not isinstance(value, (list, tuple)):
             # Convert whatever we find to what pysolr wants.
             value = self.backend.conn._from_python(value)

haystack/backends/whoosh_backend.py

@@ -605,6 +605,10 @@ def build_query_fragment(self, field, filter_type, value):
         result = ''
         is_datetime = False
 
+        # Handle when we've got a ``ValuesListQuerySet``...
+        if hasattr(value, 'values_list'):
+            value = list(value)
+        
         if hasattr(value, 'strftime'):
             is_datetime = True
 

tests/solr_tests/tests/solr_query.py

@@ -109,3 +109,8 @@ class IttyBittyResult(object):
         # Reset to default.
         self.sq.set_result_class(None)
         self.assertTrue(issubclass(self.sq.result_class, SearchResult))
+    
+    def test_in_filter_values_list(self):
+        self.sq.add_filter(SQ(content='why'))
+        self.sq.add_filter(SQ(title__in=MockModel.objects.values_list('id', flat=True)))
+        self.assertEqual(self.sq.build_query(), u'(why AND (title:"1" OR title:"2" OR title:"3"))')

tests/whoosh_tests/tests/whoosh_query.py

@@ -127,3 +127,8 @@ class IttyBittyResult(object):
         # Reset to default.
         self.sq.set_result_class(None)
         self.assertTrue(issubclass(self.sq.result_class, SearchResult))
+    
+    def test_in_filter_values_list(self):
+        self.sq.add_filter(SQ(content='why'))
+        self.sq.add_filter(SQ(title__in=MockModel.objects.values_list('id', flat=True)))
+        self.assertEqual(self.sq.build_query(), u'(why AND (title:"1" OR title:"2" OR title:"3"))')