test/fixtures/room.rb in composite_primary_keys-3.1.6 vs test/fixtures/room.rb in composite_primary_keys-3.1.7

- old
+ new

@@ -1,7 +1,8 @@ class Room < ActiveRecord::Base set_primary_keys :dorm_id, :room_id belongs_to :dorm + has_many :room_assignments, :foreign_key => [:dorm_id, :room_id] has_many :room_attribute_assignments, :foreign_key => [:dorm_id, :room_id] has_many :room_attributes, :through => :room_attribute_assignments def find_custom_room_attributes room_attributes.find(:all, :conditions => ["room_attributes.name != ?", "keg"])