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_methods.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_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 897ff5c8af..9c5be4ad9b 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -930,7 +930,7 @@ module ActiveRecord arel.where(where_clause.ast) unless where_clause.empty? arel.having(having_clause.ast) unless having_clause.empty? if limit_value - limit_attribute = Attribute.with_cast_value( + limit_attribute = ActiveModel::Attribute.with_cast_value( "LIMIT".freeze, connection.sanitize_limit(limit_value), Type.default_value, @@ -938,7 +938,7 @@ module ActiveRecord arel.take(Arel::Nodes::BindParam.new(limit_attribute)) end if offset_value - offset_attribute = Attribute.with_cast_value( + offset_attribute = ActiveModel::Attribute.with_cast_value( "OFFSET".freeze, offset_value.to_i, Type.default_value, |