diff options
| author | Dmitry Polushkin <dmitry.polushkin@gmail.com> | 2011-12-31 01:10:42 +0000 |
|---|---|---|
| committer | Dmitry Polushkin <dmitry.polushkin@gmail.com> | 2011-12-31 01:10:42 +0000 |
| commit | 04bc40ff501b1bf81bec7ce3937cb06c896ffc69 (patch) | |
| tree | 88a33663195900df8a7307aefa2c9aaa561c3973 /activerecord/test/models/owner.rb | |
| parent | 84eece0a823e9c601ea99a8709f24605a19bcbfd (diff) | |
| parent | ed17983ec56dec689a0311c7f8fcbeba9874e5a4 (diff) | |
| download | rails-04bc40ff501b1bf81bec7ce3937cb06c896ffc69.tar.gz rails-04bc40ff501b1bf81bec7ce3937cb06c896ffc69.tar.bz2 rails-04bc40ff501b1bf81bec7ce3937cb06c896ffc69.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activerecord/test/models/owner.rb')
| -rw-r--r-- | activerecord/test/models/owner.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/models/owner.rb b/activerecord/test/models/owner.rb index 5760b991ec..fea55f4535 100644 --- a/activerecord/test/models/owner.rb +++ b/activerecord/test/models/owner.rb @@ -1,5 +1,5 @@ class Owner < ActiveRecord::Base - set_primary_key :owner_id + self.primary_key = :owner_id has_many :pets has_many :toys, :through => :pets end |