diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-02-06 09:27:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-06 09:27:23 +0100 |
commit | 2bbea8b0996a45f9bdfafe3b63f123cca4614e10 (patch) | |
tree | 213ae3bed9a500a11b32a37c00abe673d75de793 /activerecord/lib/active_record | |
parent | b9ae7481fd5653fc6430148f06e0fca27317829e (diff) | |
parent | 1c1aba775826589b5038959120ea57e050e38123 (diff) | |
download | rails-2bbea8b0996a45f9bdfafe3b63f123cca4614e10.tar.gz rails-2bbea8b0996a45f9bdfafe3b63f123cca4614e10.tar.bz2 rails-2bbea8b0996a45f9bdfafe3b63f123cca4614e10.zip |
Merge pull request #27902 from kirs/yaml-column-error
Indicate action that failed in YamlColumn
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/coders/yaml_column.rb | 8 | ||||
-rw-r--r-- | activerecord/lib/active_record/type/serialized.rb | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/coders/yaml_column.rb b/activerecord/lib/active_record/coders/yaml_column.rb index 2136da43fe..9c52a31b95 100644 --- a/activerecord/lib/active_record/coders/yaml_column.rb +++ b/activerecord/lib/active_record/coders/yaml_column.rb @@ -14,7 +14,7 @@ module ActiveRecord def dump(obj) return if obj.nil? - assert_valid_value(obj) + assert_valid_value(obj, action: "dump") YAML.dump obj end @@ -23,16 +23,16 @@ module ActiveRecord return yaml unless yaml.is_a?(String) && /^---/.match?(yaml) obj = YAML.load(yaml) - assert_valid_value(obj) + assert_valid_value(obj, action: "load") obj ||= object_class.new if object_class != Object obj end - def assert_valid_value(obj) + def assert_valid_value(obj, action:) unless obj.nil? || obj.is_a?(object_class) raise SerializationTypeMismatch, - "Attribute `#{@attr_name}` was supposed to be a #{object_class}, but was a #{obj.class}. -- #{obj.inspect}" + "can't #{action} `#{@attr_name}`: was supposed to be a #{object_class}, but was a #{obj.class}. -- #{obj.inspect}" end end diff --git a/activerecord/lib/active_record/type/serialized.rb b/activerecord/lib/active_record/type/serialized.rb index ac9134bfcb..6af05c1860 100644 --- a/activerecord/lib/active_record/type/serialized.rb +++ b/activerecord/lib/active_record/type/serialized.rb @@ -43,7 +43,7 @@ module ActiveRecord def assert_valid_value(value) if coder.respond_to?(:assert_valid_value) - coder.assert_valid_value(value) + coder.assert_valid_value(value, action: "serialize") end end |