diff options
| -rw-r--r-- | activerecord/CHANGELOG.md | 14 | ||||
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/read.rb | 5 | ||||
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/fixtures_test.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/fixtures/pirates.yml | 3 | ||||
| -rw-r--r-- | guides/source/configuring.md | 2 |
6 files changed, 20 insertions, 10 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 97e65a5bb9..3c4f06ccf8 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,7 @@ +* Fix accessing of fixtures having non-string labels like Fixnum. + + *Prathamesh Sonpatki* + * Remove deprecated support to preload instance-dependent associations. *Yves Senn* @@ -29,12 +33,12 @@ *Rafael Mendonça França* -* Change transaction callbacks to not swallowing errors. +* Change transaction callbacks to not swallow errors. - Before this change any error raised inside a transaction callback are - rescued and printed in the logs. + Before this change any errors raised inside a transaction callback + were getting rescued and printed in the logs. - Now these errors are not rescue anymore and just bubble up, as the other callbacks. + Now these errors are not rescued anymore and just bubble up, as the other callbacks. *Rafael Mendonça França* @@ -54,7 +58,7 @@ *Rafael Mendonça França* -* Remove deprecated access to connection specification using a string acessor. +* Remove deprecated access to connection specification using a string accessor. Now all strings will be handled as a URL. diff --git a/activerecord/lib/active_record/attribute_methods/read.rb b/activerecord/lib/active_record/attribute_methods/read.rb index 4b72fe7d7e..17f287c1b7 100644 --- a/activerecord/lib/active_record/attribute_methods/read.rb +++ b/activerecord/lib/active_record/attribute_methods/read.rb @@ -75,9 +75,8 @@ module ActiveRecord private - def attribute(attribute_name) - _read_attribute(attribute_name) - end + alias :attribute :_read_attribute + end end end diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 5f6a75ebef..10e9be20b5 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -882,7 +882,7 @@ module ActiveRecord @fixture_cache[fs_name] ||= {} instances = fixture_names.map do |f_name| - f_name = f_name.to_s + f_name = f_name.to_s if f_name.is_a?(Symbol) @fixture_cache[fs_name].delete(f_name) if force_reload if @loaded_fixtures[fs_name][f_name] diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb index 9edeb8b47f..07ec08ccf5 100644 --- a/activerecord/test/cases/fixtures_test.rb +++ b/activerecord/test/cases/fixtures_test.rb @@ -792,6 +792,10 @@ class FoxyFixturesTest < ActiveRecord::TestCase assert_equal("X marks the spot!", pirates(:mark).catchphrase) end + def test_supports_label_interpolation_for_fixnum_label + assert_equal("#1 pirate!", pirates(1).catchphrase) + end + def test_supports_polymorphic_belongs_to assert_equal(pirates(:redbeard), treasures(:sapphire).looter) assert_equal(parrots(:louis), treasures(:ruby).looter) diff --git a/activerecord/test/fixtures/pirates.yml b/activerecord/test/fixtures/pirates.yml index 1bb3bf0051..0b1a785853 100644 --- a/activerecord/test/fixtures/pirates.yml +++ b/activerecord/test/fixtures/pirates.yml @@ -10,3 +10,6 @@ redbeard: mark: catchphrase: "X $LABELs the spot!" + +1: + catchphrase: "#$LABEL pirate!" diff --git a/guides/source/configuring.md b/guides/source/configuring.md index 5baab8a4b5..622f79a50f 100644 --- a/guides/source/configuring.md +++ b/guides/source/configuring.md @@ -110,7 +110,7 @@ numbers. New applications filter out passwords by adding the following `config.f * `config.log_formatter` defines the formatter of the Rails logger. This option defaults to an instance of `ActiveSupport::Logger::SimpleFormatter` for all modes except production, where it defaults to `Logger::Formatter`. -* `config.log_level` defines the verbosity of the Rails logger. This option defaults to `:debug` for all environments. +* `config.log_level` defines the verbosity of the Rails logger. This option defaults to `:debug` for all environments. The available log levels are: :debug, :info, :warn, :error, :fatal, and :unknown. * `config.log_tags` accepts a list of methods that the `request` object responds to. This makes it easy to tag log lines with debug information like subdomain and request id - both very helpful in debugging multi-user production applications. |