aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Griffin <sean@thoughtbot.com>2014-10-23 14:10:33 -0600
committerSean Griffin <sean@thoughtbot.com>2014-10-24 09:01:05 -0500
commit0c99711a1564bf1cb213b35142a3c05feddef0bd (patch)
treedbb13a31bc2e9c523066e50a4833b0ee728d218c
parent0e6c7e6de73fdddaf7f1486657f4d9f8e8f5fde3 (diff)
downloadrails-0c99711a1564bf1cb213b35142a3c05feddef0bd.tar.gz
rails-0c99711a1564bf1cb213b35142a3c05feddef0bd.tar.bz2
rails-0c99711a1564bf1cb213b35142a3c05feddef0bd.zip
Binary nodes should not generate the same hash as nodes of other classes
-rw-r--r--lib/arel/nodes/binary.rb2
-rw-r--r--test/nodes/test_binary.rb26
2 files changed, 27 insertions, 1 deletions
diff --git a/lib/arel/nodes/binary.rb b/lib/arel/nodes/binary.rb
index e35d2fd2e7..dddbde1431 100644
--- a/lib/arel/nodes/binary.rb
+++ b/lib/arel/nodes/binary.rb
@@ -16,7 +16,7 @@ module Arel
end
def hash
- [@left, @right].hash
+ [self.class, @left, @right].hash
end
def eql? other
diff --git a/test/nodes/test_binary.rb b/test/nodes/test_binary.rb
new file mode 100644
index 0000000000..7e25a21151
--- /dev/null
+++ b/test/nodes/test_binary.rb
@@ -0,0 +1,26 @@
+require 'helper'
+require 'set'
+
+module Arel
+ module Nodes
+ describe 'Binary' do
+ describe '#hash' do
+ it 'generates a hash based on its value' do
+ eq = Equality.new('foo', 'bar')
+ eq2 = Equality.new('foo', 'bar')
+ eq3 = Equality.new('bar', 'baz')
+
+ assert_equal eq.hash, eq2.hash
+ refute_equal eq.hash, eq3.hash
+ end
+
+ it 'generates a hash specific to its class' do
+ eq = Equality.new('foo', 'bar')
+ neq = NotEqual.new('foo', 'bar')
+
+ refute_equal eq.hash, neq.hash
+ end
+ end
+ end
+ end
+end