From dd12624016567cfeb5a2886f9720ef8935b23f23 Mon Sep 17 00:00:00 2001
From: Tobias Raeder <tobias.raeder@gmail.com>
Date: Fri, 27 Feb 2015 15:15:10 +0100
Subject: [PATCH] Fix usage of type_cast in preparation of rails 4.2.0 upgrade

---
 lib/forty_facets/filter/facet_filter_definition.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/forty_facets/filter/facet_filter_definition.rb b/lib/forty_facets/filter/facet_filter_definition.rb
index 7dbb7f0..4eef139 100644
--- a/lib/forty_facets/filter/facet_filter_definition.rb
+++ b/lib/forty_facets/filter/facet_filter_definition.rb
@@ -49,7 +49,7 @@ class AttributeFilter < FacetFilter
       def selected
         entity = definition.origin_class
         column = entity.columns_hash[definition.attribute.to_s]
-        values.map{|v| column.type_cast(v)}
+        values.map{|v| entity.connection.type_cast(v, column)}
       end
 
       def build_scope
@@ -169,6 +169,8 @@ def build_filter(search_instance, param_value)
           BelongsToFilter.new(self, search_instance, param_value)
         elsif association.macro == :has_many
           HasManyFilter.new(self, search_instance, param_value)
+        elsif association.macro == :has_and_belongs_to_many
+          HasManyFilter.new(self, search_instance, param_value)
         else
           raise "Unsupported association type: #{association.macro}"
         end