diff options
| author | James Le Cuirot <chewi@aura-online.co.uk> | 2010-06-09 12:33:40 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-06-09 18:17:52 +0530 |
| commit | 0265c708b9696c3943518ad5f3dabdc22c5eba11 (patch) | |
| tree | 7656b7510358e01f53626dd74f611ff652d29b81 /activerecord/test/models/pirate.rb | |
| parent | 6898c167c3906b87dcf52cf6c088ae9f08f3ad22 (diff) | |
| download | rails-0265c708b9696c3943518ad5f3dabdc22c5eba11.tar.gz rails-0265c708b9696c3943518ad5f3dabdc22c5eba11.tar.bz2 rails-0265c708b9696c3943518ad5f3dabdc22c5eba11.zip | |
Don't overwrite unsaved updates when loading an association but preserve the order of the loaded records. [#4642 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'activerecord/test/models/pirate.rb')
| -rw-r--r-- | activerecord/test/models/pirate.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/models/pirate.rb b/activerecord/test/models/pirate.rb index f1dbe32c6e..d89c8cf381 100644 --- a/activerecord/test/models/pirate.rb +++ b/activerecord/test/models/pirate.rb @@ -1,7 +1,7 @@ class Pirate < ActiveRecord::Base belongs_to :parrot, :validate => true belongs_to :non_validated_parrot, :class_name => 'Parrot' - has_and_belongs_to_many :parrots, :validate => true + has_and_belongs_to_many :parrots, :validate => true, :order => 'parrots.id ASC' has_and_belongs_to_many :non_validated_parrots, :class_name => 'Parrot' has_and_belongs_to_many :parrots_with_method_callbacks, :class_name => "Parrot", :before_add => :log_before_add, @@ -21,7 +21,7 @@ class Pirate < ActiveRecord::Base has_one :ship has_one :update_only_ship, :class_name => 'Ship' has_one :non_validated_ship, :class_name => 'Ship' - has_many :birds + has_many :birds, :order => 'birds.id ASC' has_many :birds_with_method_callbacks, :class_name => "Bird", :before_add => :log_before_add, :after_add => :log_after_add, |