lib/sunspot/query/base_query.rb in UnderpantsGnome-sunspot-0.9.1.1 vs lib/sunspot/query/base_query.rb in UnderpantsGnome-sunspot-0.9.8.1

@@ -7,12 +7,12 @@
     class BaseQuery #:nodoc:
       include RSolr::Char
 
       attr_writer :keywords
 
-      def initialize(setup)
-        @setup = setup
+      def initialize(types, setup)
+        @types, @setup = types, setup
       end
 
       # 
       # Generate params for the base query. If keywords are specified, build
       # params for a dismax query, request all stored fields plus the score,
@@ -62,10 +62,10 @@
       #
       # Wraps each type in quotes to escape names of the form Namespace::Class
       #
       def escaped_types
         @escaped_types ||=
-          @setup.type_names.map { |name| escape(name)}
+          @types.map { |type| escape(type.name)}
       end
 
       # 
       # Returns the names of text fields that should be queried in a keyword
       # search. If specific fields are requested, use those; otherwise use the