diff options
| author | José Valim <jose.valim@gmail.com> | 2010-06-11 17:05:54 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-06-11 17:05:54 +0200 |
| commit | 85cc1fa657f441417f36998a32a6a158c2697aad (patch) | |
| tree | 457d830160931a39a07509a65346b248e97bc5e0 /activerecord/test/models/pirate.rb | |
| parent | b4976ce91ba003942acd3f285c6b4fb308657a69 (diff) | |
| download | rails-85cc1fa657f441417f36998a32a6a158c2697aad.tar.gz rails-85cc1fa657f441417f36998a32a6a158c2697aad.tar.bz2 rails-85cc1fa657f441417f36998a32a6a158c2697aad.zip | |
Revert "Don't overwrite unsaved updates when loading an association but preserve the order of the loaded records. [#4642 state:open]"
This commit introduced a regression described in ticket [#4830].
This reverts commit 0265c708b9696c3943518ad5f3dabdc22c5eba11.
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 d89c8cf381..f1dbe32c6e 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, :order => 'parrots.id ASC' + has_and_belongs_to_many :parrots, :validate => true 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, :order => 'birds.id ASC' + has_many :birds has_many :birds_with_method_callbacks, :class_name => "Bird", :before_add => :log_before_add, :after_add => :log_after_add, |