diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2019-04-02 00:10:09 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-02 00:10:09 +0900 |
commit | e0a9e0259c56700fc83b3e886cdf7c04f6a83495 (patch) | |
tree | 1a5155bb6d334e31d9f42476372f1d7334a9b80b /activerecord/lib/arel/nodes/delete_statement.rb | |
parent | d3a6277fd60b73ecdf1ad52db97cd9808c2ab2a8 (diff) | |
parent | 6e43a207c6d3072d10b494d605b7bb6635043e30 (diff) | |
download | rails-e0a9e0259c56700fc83b3e886cdf7c04f6a83495.tar.gz rails-e0a9e0259c56700fc83b3e886cdf7c04f6a83495.tar.bz2 rails-e0a9e0259c56700fc83b3e886cdf7c04f6a83495.zip |
Merge pull request #35816 from kamipo/partly_revert_query_annotation_for_update_and_delete
Revert unused code and re-using query annotation for `update_all` and `delete_all`
Diffstat (limited to 'activerecord/lib/arel/nodes/delete_statement.rb')
-rw-r--r-- | activerecord/lib/arel/nodes/delete_statement.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/activerecord/lib/arel/nodes/delete_statement.rb b/activerecord/lib/arel/nodes/delete_statement.rb index 56249b2bad..a419975335 100644 --- a/activerecord/lib/arel/nodes/delete_statement.rb +++ b/activerecord/lib/arel/nodes/delete_statement.rb @@ -3,7 +3,7 @@ module Arel # :nodoc: all module Nodes class DeleteStatement < Arel::Nodes::Node - attr_accessor :left, :right, :orders, :limit, :offset, :key, :comment + attr_accessor :left, :right, :orders, :limit, :offset, :key alias :relation :left alias :relation= :left= @@ -18,18 +18,16 @@ module Arel # :nodoc: all @limit = nil @offset = nil @key = nil - @comment = nil end def initialize_copy(other) super @left = @left.clone if @left @right = @right.clone if @right - @comment = @comment.clone if @comment end def hash - [self.class, @left, @right, @orders, @limit, @offset, @key, @comment].hash + [self.class, @left, @right, @orders, @limit, @offset, @key].hash end def eql?(other) @@ -39,8 +37,7 @@ module Arel # :nodoc: all self.orders == other.orders && self.limit == other.limit && self.offset == other.offset && - self.key == other.key && - self.comment == other.comment + self.key == other.key end alias :== :eql? end |