diff options
author | Ernie Miller <ernie@metautonomo.us> | 2010-04-24 08:02:47 -0400 |
---|---|---|
committer | Ernie Miller <ernie@metautonomo.us> | 2010-05-07 13:08:31 -0400 |
commit | 5afed6d45def1e72df24679a746cbe96b52c1709 (patch) | |
tree | 50c8ab67f97c3aeba71046cb397f5e3f572c606b /spec | |
parent | acdb9ea3036466b6553c85486f8fdfc5909f1275 (diff) | |
download | rails-5afed6d45def1e72df24679a746cbe96b52c1709.tar.gz rails-5afed6d45def1e72df24679a746cbe96b52c1709.tar.bz2 rails-5afed6d45def1e72df24679a746cbe96b52c1709.zip |
Inequality shouldn't descend from equality, due to Rails type checks, and resolve conflicts from rebase
Diffstat (limited to 'spec')
-rw-r--r-- | spec/engines/sql/unit/predicates/noteq_spec.rb (renamed from spec/engines/sql/unit/predicates/not_spec.rb) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/engines/sql/unit/predicates/not_spec.rb b/spec/engines/sql/unit/predicates/noteq_spec.rb index b124d4c80b..ed24627323 100644 --- a/spec/engines/sql/unit/predicates/not_spec.rb +++ b/spec/engines/sql/unit/predicates/noteq_spec.rb @@ -13,7 +13,7 @@ module Arel describe '#to_sql' do describe 'when relating to a non-nil value' do it "manufactures a not predicate" do - sql = Not.new(@attribute1, @attribute2).to_sql + sql = Inequality.new(@attribute1, @attribute2).to_sql adapter_is :mysql do sql.should be_like(%Q{`users`.`id` != `photos`.`user_id`}) @@ -35,7 +35,7 @@ module Arel end it "manufactures an is null predicate" do - sql = Not.new(@attribute1, @nil).to_sql + sql = Inequality.new(@attribute1, @nil).to_sql adapter_is :mysql do sql.should be_like(%Q{`users`.`id` IS NOT NULL}) @@ -54,7 +54,7 @@ module Arel describe "when relating to a nil Value" do it "manufactures an IS NULL predicate" do value = nil.bind(@relation1) - sql = Not.new(@attribute1, value).to_sql + sql = Inequality.new(@attribute1, value).to_sql adapter_is :mysql do sql.should be_like(%Q{`users`.`id` IS NOT NULL}) |