fixing association conditions when MetaWhere is installed (thanks acm…

…etech) - closes #261
ryanb · Mar 8, 2011 · 52435e9 · 52435e9
1 parent 79995e4
commit 52435e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Gemfile b/Gemfile
@@ -5,6 +5,7 @@ when nil, "active_record"
   gem "sqlite3-ruby", :require => "sqlite3"
   gem "activerecord", :require => "active_record"
   gem "with_model"
+  gem "meta_where"
 when "data_mapper"
   gem "dm-core", "~> 1.0.2"
   gem "dm-sqlite-adapter", "~> 1.0.2"

diff --git a/lib/cancan/model_adapters/active_record_adapter.rb b/lib/cancan/model_adapters/active_record_adapter.rb
@@ -36,7 +36,7 @@ def tableized_conditions(conditions, model_class = @model_class)
         conditions.inject({}) do |result_hash, (name, value)|
           if value.kind_of? Hash
             association_class = model_class.reflect_on_association(name).class_name.constantize
-            name = model_class.reflect_on_association(name).table_name
+            name = model_class.reflect_on_association(name).table_name.to_sym
             value = tableized_conditions(value, association_class)
           end
           result_hash[name] = value