lib/thinking_sphinx/association.rb in freelancing-god-thinking-sphinx-0.9.6 vs lib/thinking_sphinx/association.rb in freelancing-god-thinking-sphinx-0.9.7

@@ -120,19 +120,19 @@
       options = ref.options.clone
       options[:polymorphic]   = nil
       options[:class_name]    = klass.name
       options[:foreign_key] ||= "#{ref.name}_id"
       
-      foreign_type = klass.connection.quote_column_name ref.options[:foreign_type]
+      quoted_foreign_type = klass.connection.quote_column_name ref.options[:foreign_type]
       case options[:conditions]
       when nil
-        options[:conditions] = "::ts_join_alias::.#{foreign_type} = '#{klass.name}'"
+        options[:conditions] = "::ts_join_alias::.#{quoted_foreign_type} = '#{klass.name}'"
       when Array
-        options[:conditions] << "::ts_join_alias::.#{foreign_type} = '#{klass.name}'"
+        options[:conditions] << "::ts_join_alias::.#{quoted_foreign_type} = '#{klass.name}'"
       when Hash
-        options[:conditions].merge!(foreign_type => klass.name)
+        options[:conditions].merge!(ref.options[:foreign_type] => klass.name)
       else
-        options[:conditions] << " AND ::ts_join_alias::.#{foreign_type} = '#{klass.name}'"
+        options[:conditions] << " AND ::ts_join_alias::.#{quoted_foreign_type} = '#{klass.name}'"
       end
       
       options
     end
   end
\ No newline at end of file