diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2017-11-09 15:12:38 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-09 15:12:38 -0500 |
commit | 100c62ae15deb3d70c5e17d880fd57971bb8759a (patch) | |
tree | 736119c8ea9b683ac465c07e6a640d7e14bbc1b0 /activerecord/lib/active_record/relation/query_attribute.rb | |
parent | dac7c8844b4d9944eaa0fca98b45ee478cdb7201 (diff) | |
parent | c3675f50d2e59b7fc173d7b332860c4b1a24a726 (diff) | |
download | rails-100c62ae15deb3d70c5e17d880fd57971bb8759a.tar.gz rails-100c62ae15deb3d70c5e17d880fd57971bb8759a.tar.bz2 rails-100c62ae15deb3d70c5e17d880fd57971bb8759a.zip |
Merge pull request #30985 from lugray/attribute_set_in_am
Move Attribute and AttributeSet to ActiveModel
Diffstat (limited to 'activerecord/lib/active_record/relation/query_attribute.rb')
-rw-r--r-- | activerecord/lib/active_record/relation/query_attribute.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/query_attribute.rb b/activerecord/lib/active_record/relation/query_attribute.rb index fad08e2613..3532f28858 100644 --- a/activerecord/lib/active_record/relation/query_attribute.rb +++ b/activerecord/lib/active_record/relation/query_attribute.rb @@ -1,10 +1,10 @@ # frozen_string_literal: true -require "active_record/attribute" +require "active_model/attribute" module ActiveRecord class Relation - class QueryAttribute < Attribute # :nodoc: + class QueryAttribute < ActiveModel::Attribute # :nodoc: def type_cast(value) value end |