diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/dispatcher.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 003ac065ac..a0e402e5e1 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added that Active Record associations are now reloaded instead of cleared to work with the new const_missing hook in Active Record. + * Added graceful handling of an inaccessible log file by redirecting output to STDERR with a warning #330 [rainmkr] * Added support for a -h/--help parameter in the generator #331 [Ulysses] diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index e3fd36d89a..0fcd295094 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -43,7 +43,7 @@ class Dispatcher if ActionController::Base.reload_dependencies Object.send(:remove_const, "ApplicationController") if Object.const_defined?(:ApplicationController) Object.send(:remove_const, controller_class_name(controller_name)) if Object.const_defined?(controller_class_name(controller_name)) - ActiveRecord::Base.reset_associations_loaded + ActiveRecord::Base.reload_associations_loaded ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses end |