diff options
author | Sean Griffin <sean@seantheprogrammer.com> | 2016-06-24 06:16:46 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-24 06:16:46 -0400 |
commit | 382704987223754f0ede7fc1e327e44531a77f43 (patch) | |
tree | 2b9c14a425ce33607e1fdbd79241bb15a552edc7 | |
parent | 4bf3534b0356a416b648d601b1db6e8a131c7fc2 (diff) | |
parent | 8f290092f088c66a88addf82e0b4cdb88b64e854 (diff) | |
download | rails-382704987223754f0ede7fc1e327e44531a77f43.tar.gz rails-382704987223754f0ede7fc1e327e44531a77f43.tar.bz2 rails-382704987223754f0ede7fc1e327e44531a77f43.zip |
Merge pull request #25506 from y-yagi/return_correct_from_enum_type
return correct type from `EnumType`
-rw-r--r-- | activerecord/lib/active_record/enum.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/enum_test.rb | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/enum.rb b/activerecord/lib/active_record/enum.rb index 7be332fb97..b884edf920 100644 --- a/activerecord/lib/active_record/enum.rb +++ b/activerecord/lib/active_record/enum.rb @@ -105,6 +105,8 @@ module ActiveRecord end class EnumType < Type::Value # :nodoc: + delegate :type, to: :subtype + def initialize(name, mapping, subtype) @name = name @mapping = mapping diff --git a/activerecord/test/cases/enum_test.rb b/activerecord/test/cases/enum_test.rb index babacd1ee9..e781b60464 100644 --- a/activerecord/test/cases/enum_test.rb +++ b/activerecord/test/cases/enum_test.rb @@ -421,4 +421,8 @@ class EnumTest < ActiveRecord::TestCase book = Book.new assert book.hard? end + + test "data type of Enum type" do + assert_equal :integer, Book.type_for_attribute('status').type + end end |