@@ -1,3 +1,5 @@ +* Use valid_keys_for_has_and_belongs_to_many_association + * Make test suite work with Rails 2.3.0 * has_and_belongs_to_many association support CHANGELOG @@ -120,29 +120,7 @@ module ActiveRecord valid_keys_for_has_many_association << :cached valid_keys_for_belongs_to_association << :cached - # TODO uncomment when Rails 2.2.1 comes out - # valid_keys_for_has_and_belongs_to_many_association << :cached - - # TODO remove when Rails 2.2.1 comes out - def create_has_and_belongs_to_many_reflection(association_id, options, &extension) #:nodoc: - options.assert_valid_keys( - :class_name, :table_name, :join_table, :foreign_key, :association_foreign_key, - :select, :conditions, :include, :order, :group, :limit, :offset, - :uniq, - :finder_sql, :delete_sql, :insert_sql, - :before_add, :after_add, :before_remove, :after_remove, - :extend, :readonly, - :validate, :cached - ) - - options[:extend] = create_extension_modules(association_id, extension, options[:extend]) - - reflection = create_reflection(:has_and_belongs_to_many, association_id, options, self) - - reflection.options[:join_table] ||= join_table_name(undecorated_table_name(self.to_s), undecorated_table_name(reflection.class_name)) - - reflection - end + valid_keys_for_has_and_belongs_to_many_association << :cached def add_has_many_cache_callbacks method_name = :has_many_after_save_cache_expire lib/activerecord/lib/active_record/associations.rb 939ad71910b6ac6ac6c557583b745613ab83821b Luca Guidi guidi.luca@gmail.com http://github.com/jodosha/cached-models/commit/9c5b5e1d0afabb973c0d7f9540a01228e15ab9b8 9c5b5e1d0afabb973c0d7f9540a01228e15ab9b8 2009-02-16T07:52:23-08:00 2009-02-16T07:52:23-08:00 Use Use valid_keys_for_has_and_belongs_to_many_association 98dd97cb3419d496fea7707c1481645570f92764 Luca Guidi guidi.luca@gmail.com