diff options
author | Bryan Helmkamp <bryan@brynary.com> | 2009-09-30 23:32:05 -0400 |
---|---|---|
committer | Bryan Helmkamp <bryan@brynary.com> | 2009-09-30 23:32:05 -0400 |
commit | bcd8ffa2183a1ca98417fb39bbd83e8f69c984c8 (patch) | |
tree | 36eac8c0fdd0a6a126a10dd7ad829401793a9379 | |
parent | 52e8aff146c162986566d3e03852395729d7c24d (diff) | |
download | rails-bcd8ffa2183a1ca98417fb39bbd83e8f69c984c8.tar.gz rails-bcd8ffa2183a1ca98417fb39bbd83e8f69c984c8.tar.bz2 rails-bcd8ffa2183a1ca98417fb39bbd83e8f69c984c8.zip |
Create Predicates module to match directory structure
-rw-r--r-- | lib/arel/algebra/predicates.rb | 62 | ||||
-rw-r--r-- | lib/arel/algebra/primitives/attribute.rb | 14 | ||||
-rw-r--r-- | lib/arel/engines/memory/predicates.rb | 50 | ||||
-rw-r--r-- | lib/arel/engines/sql/predicates.rb | 72 | ||||
-rw-r--r-- | spec/arel/algebra/unit/predicates/binary_spec.rb | 42 | ||||
-rw-r--r-- | spec/arel/algebra/unit/predicates/equality_spec.rb | 36 | ||||
-rw-r--r-- | spec/arel/algebra/unit/predicates/in_spec.rb | 10 | ||||
-rw-r--r-- | spec/arel/algebra/unit/primitives/attribute_spec.rb | 14 | ||||
-rw-r--r-- | spec/arel/algebra/unit/relations/relation_spec.rb | 2 | ||||
-rw-r--r-- | spec/arel/engines/sql/unit/predicates/binary_spec.rb | 150 | ||||
-rw-r--r-- | spec/arel/engines/sql/unit/predicates/equality_spec.rb | 78 | ||||
-rw-r--r-- | spec/arel/engines/sql/unit/predicates/in_spec.rb | 110 | ||||
-rw-r--r-- | spec/arel/engines/sql/unit/predicates/predicates_spec.rb | 92 |
13 files changed, 376 insertions, 356 deletions
diff --git a/lib/arel/algebra/predicates.rb b/lib/arel/algebra/predicates.rb index 72167c2b27..8a0b41fa18 100644 --- a/lib/arel/algebra/predicates.rb +++ b/lib/arel/algebra/predicates.rb @@ -1,41 +1,43 @@ module Arel - class Predicate - def or(other_predicate) - Or.new(self, other_predicate) - end + module Predicates + class Predicate + def or(other_predicate) + Or.new(self, other_predicate) + end - def and(other_predicate) - And.new(self, other_predicate) + def and(other_predicate) + And.new(self, other_predicate) + end end - end - class Binary < Predicate - attributes :operand1, :operand2 - deriving :initialize + class Binary < Predicate + attributes :operand1, :operand2 + deriving :initialize - def ==(other) - self.class === other and - @operand1 == other.operand1 and - @operand2 == other.operand2 - end + def ==(other) + self.class === other and + @operand1 == other.operand1 and + @operand2 == other.operand2 + end - def bind(relation) - self.class.new(operand1.find_correlate_in(relation), operand2.find_correlate_in(relation)) + def bind(relation) + self.class.new(operand1.find_correlate_in(relation), operand2.find_correlate_in(relation)) + end end - end - class Equality < Binary - def ==(other) - Equality === other and - ((operand1 == other.operand1 and operand2 == other.operand2) or - (operand1 == other.operand2 and operand2 == other.operand1)) + class Equality < Binary + def ==(other) + Equality === other and + ((operand1 == other.operand1 and operand2 == other.operand2) or + (operand1 == other.operand2 and operand2 == other.operand1)) + end end - end - class GreaterThanOrEqualTo < Binary; end - class GreaterThan < Binary; end - class LessThanOrEqualTo < Binary; end - class LessThan < Binary; end - class Match < Binary; end - class In < Binary; end + class GreaterThanOrEqualTo < Binary; end + class GreaterThan < Binary; end + class LessThanOrEqualTo < Binary; end + class LessThan < Binary; end + class Match < Binary; end + class In < Binary; end + end end diff --git a/lib/arel/algebra/primitives/attribute.rb b/lib/arel/algebra/primitives/attribute.rb index 44a2f41733..40a7d61a53 100644 --- a/lib/arel/algebra/primitives/attribute.rb +++ b/lib/arel/algebra/primitives/attribute.rb @@ -82,31 +82,31 @@ module Arel module Predications def eq(other) - Equality.new(self, other) + Predicates::Equality.new(self, other) end def lt(other) - LessThan.new(self, other) + Predicates::LessThan.new(self, other) end def lteq(other) - LessThanOrEqualTo.new(self, other) + Predicates::LessThanOrEqualTo.new(self, other) end def gt(other) - GreaterThan.new(self, other) + Predicates::GreaterThan.new(self, other) end def gteq(other) - GreaterThanOrEqualTo.new(self, other) + Predicates::GreaterThanOrEqualTo.new(self, other) end def matches(regexp) - Match.new(self, regexp) + Predicates::Match.new(self, regexp) end def in(array) - In.new(self, array) + Predicates::In.new(self, array) end end include Predications diff --git a/lib/arel/engines/memory/predicates.rb b/lib/arel/engines/memory/predicates.rb index 03d4f25b0a..dd2559c70f 100644 --- a/lib/arel/engines/memory/predicates.rb +++ b/lib/arel/engines/memory/predicates.rb @@ -1,35 +1,37 @@ module Arel - class Binary < Predicate - def eval(row) - operand1.eval(row).send(operator, operand2.eval(row)) + module Predicates + class Binary < Predicate + def eval(row) + operand1.eval(row).send(operator, operand2.eval(row)) + end end - end - class Equality < Binary - def operator; :== end - end + class Equality < Binary + def operator; :== end + end - class GreaterThanOrEqualTo < Binary - def operator; :>= end - end + class GreaterThanOrEqualTo < Binary + def operator; :>= end + end - class GreaterThan < Binary - def operator; :> end - end + class GreaterThan < Binary + def operator; :> end + end - class LessThanOrEqualTo < Binary - def operator; :<= end - end + class LessThanOrEqualTo < Binary + def operator; :<= end + end - class LessThan < Binary - def operator; :< end - end + class LessThan < Binary + def operator; :< end + end - class Match < Binary - def operator; :=~ end - end + class Match < Binary + def operator; :=~ end + end - class In < Binary - def operator; :include? end + class In < Binary + def operator; :include? end + end end end diff --git a/lib/arel/engines/sql/predicates.rb b/lib/arel/engines/sql/predicates.rb index b84c183c1d..e563a9ba3e 100644 --- a/lib/arel/engines/sql/predicates.rb +++ b/lib/arel/engines/sql/predicates.rb @@ -1,51 +1,53 @@ module Arel - class Binary < Predicate - def to_sql(formatter = nil) - "#{operand1.to_sql} #{predicate_sql} #{operand1.format(operand2)}" + module Predicates + class Binary < Predicate + def to_sql(formatter = nil) + "#{operand1.to_sql} #{predicate_sql} #{operand1.format(operand2)}" + end end - end - class CompoundPredicate < Binary - def to_sql(formatter = nil) - "(#{operand1.to_sql(formatter)} #{predicate_sql} #{operand2.to_sql(formatter)})" + class CompoundPredicate < Binary + def to_sql(formatter = nil) + "(#{operand1.to_sql(formatter)} #{predicate_sql} #{operand2.to_sql(formatter)})" + end end - end - class Or < CompoundPredicate - def predicate_sql; "OR" end - end + class Or < CompoundPredicate + def predicate_sql; "OR" end + end - class And < CompoundPredicate - def predicate_sql; "AND" end - end + class And < CompoundPredicate + def predicate_sql; "AND" end + end - class Equality < Binary - def predicate_sql - operand2.equality_predicate_sql + class Equality < Binary + def predicate_sql + operand2.equality_predicate_sql + end end - end - class GreaterThanOrEqualTo < Binary - def predicate_sql; '>=' end - end + class GreaterThanOrEqualTo < Binary + def predicate_sql; '>=' end + end - class GreaterThan < Binary - def predicate_sql; '>' end - end + class GreaterThan < Binary + def predicate_sql; '>' end + end - class LessThanOrEqualTo < Binary - def predicate_sql; '<=' end - end + class LessThanOrEqualTo < Binary + def predicate_sql; '<=' end + end - class LessThan < Binary - def predicate_sql; '<' end - end + class LessThan < Binary + def predicate_sql; '<' end + end - class Match < Binary - def predicate_sql; 'LIKE' end - end + class Match < Binary + def predicate_sql; 'LIKE' end + end - class In < Binary - def predicate_sql; operand2.inclusion_predicate_sql end + class In < Binary + def predicate_sql; operand2.inclusion_predicate_sql end + end end end diff --git a/spec/arel/algebra/unit/predicates/binary_spec.rb b/spec/arel/algebra/unit/predicates/binary_spec.rb index 97ef098e0e..be4c1ac738 100644 --- a/spec/arel/algebra/unit/predicates/binary_spec.rb +++ b/spec/arel/algebra/unit/predicates/binary_spec.rb @@ -1,31 +1,33 @@ require 'spec_helper' module Arel - describe Binary do - before do - @relation = Table.new(:users) - @attribute1 = @relation[:id] - @attribute2 = @relation[:name] - class ConcreteBinary < Binary - end - end - - describe '#bind' do + module Predicates + describe Binary do before do - @another_relation = @relation.alias + @relation = Table.new(:users) + @attribute1 = @relation[:id] + @attribute2 = @relation[:name] + class ConcreteBinary < Binary + end end - describe 'when both operands are attributes' do - it "manufactures an expression with the attributes bound to the relation" do - ConcreteBinary.new(@attribute1, @attribute2).bind(@another_relation). \ - should == ConcreteBinary.new(@another_relation[@attribute1], @another_relation[@attribute2]) + describe '#bind' do + before do + @another_relation = @relation.alias + end + + describe 'when both operands are attributes' do + it "manufactures an expression with the attributes bound to the relation" do + ConcreteBinary.new(@attribute1, @attribute2).bind(@another_relation). \ + should == ConcreteBinary.new(@another_relation[@attribute1], @another_relation[@attribute2]) + end end - end - describe 'when an operand is a value' do - it "manufactures an expression with unmodified values" do - ConcreteBinary.new(@attribute1, "asdf").bind(@another_relation). \ - should == ConcreteBinary.new(@attribute1.find_correlate_in(@another_relation), "asdf".find_correlate_in(@another_relation)) + describe 'when an operand is a value' do + it "manufactures an expression with unmodified values" do + ConcreteBinary.new(@attribute1, "asdf").bind(@another_relation). \ + should == ConcreteBinary.new(@attribute1.find_correlate_in(@another_relation), "asdf".find_correlate_in(@another_relation)) + end end end end diff --git a/spec/arel/algebra/unit/predicates/equality_spec.rb b/spec/arel/algebra/unit/predicates/equality_spec.rb index 01917842f6..cfd04cd90c 100644 --- a/spec/arel/algebra/unit/predicates/equality_spec.rb +++ b/spec/arel/algebra/unit/predicates/equality_spec.rb @@ -1,26 +1,28 @@ require 'spec_helper' module Arel - describe Equality do - before do - @relation1 = Table.new(:users) - @relation2 = Table.new(:photos) - @attribute1 = @relation1[:id] - @attribute2 = @relation2[:user_id] - end - - describe '==' do - it "obtains if attribute1 and attribute2 are identical" do - check Equality.new(@attribute1, @attribute2).should == Equality.new(@attribute1, @attribute2) - Equality.new(@attribute1, @attribute2).should_not == Equality.new(@attribute1, @attribute1) + module Predicates + describe Equality do + before do + @relation1 = Table.new(:users) + @relation2 = Table.new(:photos) + @attribute1 = @relation1[:id] + @attribute2 = @relation2[:user_id] end - it "obtains if the concrete type of the predicates are identical" do - Equality.new(@attribute1, @attribute2).should_not == Binary.new(@attribute1, @attribute2) - end + describe '==' do + it "obtains if attribute1 and attribute2 are identical" do + check Equality.new(@attribute1, @attribute2).should == Equality.new(@attribute1, @attribute2) + Equality.new(@attribute1, @attribute2).should_not == Equality.new(@attribute1, @attribute1) + end + + it "obtains if the concrete type of the predicates are identical" do + Equality.new(@attribute1, @attribute2).should_not == Binary.new(@attribute1, @attribute2) + end - it "is commutative on the attributes" do - Equality.new(@attribute1, @attribute2).should == Equality.new(@attribute2, @attribute1) + it "is commutative on the attributes" do + Equality.new(@attribute1, @attribute2).should == Equality.new(@attribute2, @attribute1) + end end end end diff --git a/spec/arel/algebra/unit/predicates/in_spec.rb b/spec/arel/algebra/unit/predicates/in_spec.rb index 54a6d6c7da..b9e15d63a4 100644 --- a/spec/arel/algebra/unit/predicates/in_spec.rb +++ b/spec/arel/algebra/unit/predicates/in_spec.rb @@ -1,10 +1,12 @@ require 'spec_helper' module Arel - describe In do - before do - @relation = Table.new(:users) - @attribute = @relation[:id] + module Predicates + describe In do + before do + @relation = Table.new(:users) + @attribute = @relation[:id] + end end end end diff --git a/spec/arel/algebra/unit/primitives/attribute_spec.rb b/spec/arel/algebra/unit/primitives/attribute_spec.rb index 93b661c6fc..f734cc9c38 100644 --- a/spec/arel/algebra/unit/primitives/attribute_spec.rb +++ b/spec/arel/algebra/unit/primitives/attribute_spec.rb @@ -87,43 +87,43 @@ module Arel describe '#eq' do it "manufactures an equality predicate" do - @attribute.eq('name').should == Equality.new(@attribute, 'name') + @attribute.eq('name').should == Predicates::Equality.new(@attribute, 'name') end end describe '#lt' do it "manufactures a less-than predicate" do - @attribute.lt(10).should == LessThan.new(@attribute, 10) + @attribute.lt(10).should == Predicates::LessThan.new(@attribute, 10) end end describe '#lteq' do it "manufactures a less-than or equal-to predicate" do - @attribute.lteq(10).should == LessThanOrEqualTo.new(@attribute, 10) + @attribute.lteq(10).should == Predicates::LessThanOrEqualTo.new(@attribute, 10) end end describe '#gt' do it "manufactures a greater-than predicate" do - @attribute.gt(10).should == GreaterThan.new(@attribute, 10) + @attribute.gt(10).should == Predicates::GreaterThan.new(@attribute, 10) end end describe '#gteq' do it "manufactures a greater-than or equal-to predicate" do - @attribute.gteq(10).should == GreaterThanOrEqualTo.new(@attribute, 10) + @attribute.gteq(10).should == Predicates::GreaterThanOrEqualTo.new(@attribute, 10) end end describe '#matches' do it "manufactures a match predicate" do - @attribute.matches(/.*/).should == Match.new(@attribute, /.*/) + @attribute.matches(/.*/).should == Predicates::Match.new(@attribute, /.*/) end end describe '#in' do it "manufactures an in predicate" do - @attribute.in(1..30).should == In.new(@attribute, (1..30)) + @attribute.in(1..30).should == Predicates::In.new(@attribute, (1..30)) end end end diff --git a/spec/arel/algebra/unit/relations/relation_spec.rb b/spec/arel/algebra/unit/relations/relation_spec.rb index 2688ece4a5..35ce8bf1fb 100644 --- a/spec/arel/algebra/unit/relations/relation_spec.rb +++ b/spec/arel/algebra/unit/relations/relation_spec.rb @@ -80,7 +80,7 @@ module Arel describe '#where' do before do - @predicate = Equality.new(@attribute1, @attribute2) + @predicate = Predicates::Equality.new(@attribute1, @attribute2) end it "manufactures a where relation" do diff --git a/spec/arel/engines/sql/unit/predicates/binary_spec.rb b/spec/arel/engines/sql/unit/predicates/binary_spec.rb index 783e6c6a7b..23bce54792 100644 --- a/spec/arel/engines/sql/unit/predicates/binary_spec.rb +++ b/spec/arel/engines/sql/unit/predicates/binary_spec.rb @@ -1,114 +1,116 @@ require 'spec_helper' module Arel - describe Binary do - class ConcreteBinary < Binary - def predicate_sql - "<=>" + module Predicates + describe Binary do + class ConcreteBinary < Binary + def predicate_sql + "<=>" + end end - end - - before do - @relation = Table.new(:users) - @attribute1 = @relation[:id] - @attribute2 = @relation[:name] - end - describe "with compound predicates" do before do - @operand1 = ConcreteBinary.new(@attribute1, 1) - @operand2 = ConcreteBinary.new(@attribute2, "name") + @relation = Table.new(:users) + @attribute1 = @relation[:id] + @attribute2 = @relation[:name] end - describe Or do - describe "#to_sql" do - it "manufactures sql with an OR operation" do - sql = Or.new(@operand1, @operand2).to_sql + describe "with compound predicates" do + before do + @operand1 = ConcreteBinary.new(@attribute1, 1) + @operand2 = ConcreteBinary.new(@attribute2, "name") + end - adapter_is :mysql do - sql.should be_like(%Q{(`users`.`id` <=> 1 OR `users`.`name` <=> 'name')}) - end + describe Or do + describe "#to_sql" do + it "manufactures sql with an OR operation" do + sql = Or.new(@operand1, @operand2).to_sql - adapter_is :postgresql do - sql.should be_like(%Q{("users"."id" <=> 1 OR "users"."name" <=> E'name')}) - end + adapter_is :mysql do + sql.should be_like(%Q{(`users`.`id` <=> 1 OR `users`.`name` <=> 'name')}) + end + + adapter_is :postgresql do + sql.should be_like(%Q{("users"."id" <=> 1 OR "users"."name" <=> E'name')}) + end - adapter_is :sqlite3 do - sql.should be_like(%Q{("users"."id" <=> 1 OR "users"."name" <=> 'name')}) + adapter_is :sqlite3 do + sql.should be_like(%Q{("users"."id" <=> 1 OR "users"."name" <=> 'name')}) + end end end end - end - describe And do - describe "#to_sql" do - it "manufactures sql with an AND operation" do - sql = And.new(@operand1, @operand2).to_sql + describe And do + describe "#to_sql" do + it "manufactures sql with an AND operation" do + sql = And.new(@operand1, @operand2).to_sql - adapter_is :mysql do - sql.should be_like(%Q{(`users`.`id` <=> 1 AND `users`.`name` <=> 'name')}) - end + adapter_is :mysql do + sql.should be_like(%Q{(`users`.`id` <=> 1 AND `users`.`name` <=> 'name')}) + end - adapter_is :sqlite3 do - sql.should be_like(%Q{("users"."id" <=> 1 AND "users"."name" <=> 'name')}) - end + adapter_is :sqlite3 do + sql.should be_like(%Q{("users"."id" <=> 1 AND "users"."name" <=> 'name')}) + end - adapter_is :postgresql do - sql.should be_like(%Q{("users"."id" <=> 1 AND "users"."name" <=> E'name')}) + adapter_is :postgresql do + sql.should be_like(%Q{("users"."id" <=> 1 AND "users"."name" <=> E'name')}) + end end end end end - end - describe '#to_sql' do - describe 'when relating two attributes' do - it 'manufactures sql with a binary operation' do - sql = ConcreteBinary.new(@attribute1, @attribute2).to_sql + describe '#to_sql' do + describe 'when relating two attributes' do + it 'manufactures sql with a binary operation' do + sql = ConcreteBinary.new(@attribute1, @attribute2).to_sql - adapter_is :mysql do - sql.should be_like(%Q{`users`.`id` <=> `users`.`name`}) - end + adapter_is :mysql do + sql.should be_like(%Q{`users`.`id` <=> `users`.`name`}) + end - adapter_is_not :mysql do - sql.should be_like(%Q{"users"."id" <=> "users"."name"}) + adapter_is_not :mysql do + sql.should be_like(%Q{"users"."id" <=> "users"."name"}) + end end end - end - describe 'when relating an attribute and a value' do - before do - @value = "1-asdf" - end + describe 'when relating an attribute and a value' do + before do + @value = "1-asdf" + end - describe 'when relating to an integer attribute' do - it 'formats values as integers' do - sql = ConcreteBinary.new(@attribute1, @value).to_sql + describe 'when relating to an integer attribute' do + it 'formats values as integers' do + sql = ConcreteBinary.new(@attribute1, @value).to_sql - adapter_is :mysql do - sql.should be_like(%Q{`users`.`id` <=> 1}) - end + adapter_is :mysql do + sql.should be_like(%Q{`users`.`id` <=> 1}) + end - adapter_is_not :mysql do - sql.should be_like(%Q{"users"."id" <=> 1}) + adapter_is_not :mysql do + sql.should be_like(%Q{"users"."id" <=> 1}) + end end end - end - describe 'when relating to a string attribute' do - it 'formats values as strings' do - sql = ConcreteBinary.new(@attribute2, @value).to_sql + describe 'when relating to a string attribute' do + it 'formats values as strings' do + sql = ConcreteBinary.new(@attribute2, @value).to_sql - adapter_is :mysql do - sql.should be_like(%Q{`users`.`name` <=> '1-asdf'}) - end + adapter_is :mysql do + sql.should be_like(%Q{`users`.`name` <=> '1-asdf'}) + end - adapter_is :sqlite3 do - sql.should be_like(%Q{"users"."name" <=> '1-asdf'}) - end + adapter_is :sqlite3 do + sql.should be_like(%Q{"users"."name" <=> '1-asdf'}) + end - adapter_is :postgresql do - sql.should be_like(%Q{"users"."name" <=> E'1-asdf'}) + adapter_is :postgresql do + sql.should be_like(%Q{"users"."name" <=> E'1-asdf'}) + end end end end diff --git a/spec/arel/engines/sql/unit/predicates/equality_spec.rb b/spec/arel/engines/sql/unit/predicates/equality_spec.rb index c4dd2c0c31..4004bb5881 100644 --- a/spec/arel/engines/sql/unit/predicates/equality_spec.rb +++ b/spec/arel/engines/sql/unit/predicates/equality_spec.rb @@ -1,58 +1,60 @@ require 'spec_helper' module Arel - describe Equality do - before do - @relation1 = Table.new(:users) - @relation2 = Table.new(:photos) - @attribute1 = @relation1[:id] - @attribute2 = @relation2[:user_id] - end + module Predicates + describe Equality do + before do + @relation1 = Table.new(:users) + @relation2 = Table.new(:photos) + @attribute1 = @relation1[:id] + @attribute2 = @relation2[:user_id] + end - describe '#to_sql' do - describe 'when relating to a non-nil value' do - it "manufactures an equality predicate" do - sql = Equality.new(@attribute1, @attribute2).to_sql + describe '#to_sql' do + describe 'when relating to a non-nil value' do + it "manufactures an equality predicate" do + sql = Equality.new(@attribute1, @attribute2).to_sql - adapter_is :mysql do - sql.should be_like(%Q{`users`.`id` = `photos`.`user_id`}) - end + adapter_is :mysql do + sql.should be_like(%Q{`users`.`id` = `photos`.`user_id`}) + end - adapter_is_not :mysql do - sql.should be_like(%Q{"users"."id" = "photos"."user_id"}) + adapter_is_not :mysql do + sql.should be_like(%Q{"users"."id" = "photos"."user_id"}) + end end end - end - describe 'when relation to a nil value' do - before do - @nil = nil - end + describe 'when relation to a nil value' do + before do + @nil = nil + end - it "manufactures an is null predicate" do - sql = Equality.new(@attribute1, @nil).to_sql + it "manufactures an is null predicate" do + sql = Equality.new(@attribute1, @nil).to_sql - adapter_is :mysql do - sql.should be_like(%Q{`users`.`id` IS NULL}) - end + adapter_is :mysql do + sql.should be_like(%Q{`users`.`id` IS NULL}) + end - adapter_is_not :mysql do - sql.should be_like(%Q{"users"."id" IS NULL}) + adapter_is_not :mysql do + sql.should be_like(%Q{"users"."id" IS NULL}) + end end end - end - describe "when relating to a nil Value" do - it "manufactures an IS NULL predicate" do - value = nil.bind(@relation1) - sql = Equality.new(@attribute1, value).to_sql + describe "when relating to a nil Value" do + it "manufactures an IS NULL predicate" do + value = nil.bind(@relation1) + sql = Equality.new(@attribute1, value).to_sql - adapter_is :mysql do - sql.should be_like(%Q{`users`.`id` IS NULL}) - end + adapter_is :mysql do + sql.should be_like(%Q{`users`.`id` IS NULL}) + end - adapter_is_not :mysql do - sql.should be_like(%Q{"users"."id" IS NULL}) + adapter_is_not :mysql do + sql.should be_like(%Q{"users"."id" IS NULL}) + end end end end diff --git a/spec/arel/engines/sql/unit/predicates/in_spec.rb b/spec/arel/engines/sql/unit/predicates/in_spec.rb index 4a3eff79ec..bb00733e60 100644 --- a/spec/arel/engines/sql/unit/predicates/in_spec.rb +++ b/spec/arel/engines/sql/unit/predicates/in_spec.rb @@ -1,83 +1,85 @@ require 'spec_helper' module Arel - describe In do - before do - @relation = Table.new(:users) - @attribute = @relation[:id] - end + module Predicates + describe In do + before do + @relation = Table.new(:users) + @attribute = @relation[:id] + end - describe '#to_sql' do - describe 'when relating to an array' do - describe 'when the array\'s elements are the same type as the attribute' do - before do - @array = [1, 2, 3] - end + describe '#to_sql' do + describe 'when relating to an array' do + describe 'when the array\'s elements are the same type as the attribute' do + before do + @array = [1, 2, 3] + end - it 'manufactures sql with a comma separated list' do - sql = In.new(@attribute, @array).to_sql + it 'manufactures sql with a comma separated list' do + sql = In.new(@attribute, @array).to_sql - adapter_is :mysql do - sql.should be_like(%Q{`users`.`id` IN (1, 2, 3)}) + adapter_is :mysql do + sql.should be_like(%Q{`users`.`id` IN (1, 2, 3)}) + end + + adapter_is_not :mysql do + sql.should be_like(%Q{"users"."id" IN (1, 2, 3)}) + end end + end - adapter_is_not :mysql do - sql.should be_like(%Q{"users"."id" IN (1, 2, 3)}) + describe 'when the array\'s elements are not same type as the attribute' do + before do + @array = ['1-asdf', 2, 3] + end + + it 'formats values in the array as the type of the attribute' do + sql = In.new(@attribute, @array).to_sql + + adapter_is :mysql do + sql.should be_like(%Q{`users`.`id` IN (1, 2, 3)}) + end + + adapter_is_not :mysql do + sql.should be_like(%Q{"users"."id" IN (1, 2, 3)}) + end end end end - describe 'when the array\'s elements are not same type as the attribute' do + describe 'when relating to a range' do before do - @array = ['1-asdf', 2, 3] + @range = 1..2 end - it 'formats values in the array as the type of the attribute' do - sql = In.new(@attribute, @array).to_sql + it 'manufactures sql with a between' do + sql = In.new(@attribute, @range).to_sql adapter_is :mysql do - sql.should be_like(%Q{`users`.`id` IN (1, 2, 3)}) + sql.should be_like(%Q{`users`.`id` BETWEEN 1 AND 2}) end adapter_is_not :mysql do - sql.should be_like(%Q{"users"."id" IN (1, 2, 3)}) + sql.should be_like(%Q{"users"."id" BETWEEN 1 AND 2}) end end end - end - - describe 'when relating to a range' do - before do - @range = 1..2 - end - - it 'manufactures sql with a between' do - sql = In.new(@attribute, @range).to_sql - - adapter_is :mysql do - sql.should be_like(%Q{`users`.`id` BETWEEN 1 AND 2}) - end - - adapter_is_not :mysql do - sql.should be_like(%Q{"users"."id" BETWEEN 1 AND 2}) - end - end - end - describe 'when relating to a relation' do - it 'manufactures sql with a subselect' do - sql = In.new(@attribute, @relation).to_sql + describe 'when relating to a relation' do + it 'manufactures sql with a subselect' do + sql = In.new(@attribute, @relation).to_sql - adapter_is :mysql do - sql.should be_like(%Q{ - `users`.`id` IN (SELECT `users`.`id`, `users`.`name` FROM `users`) - }) - end + adapter_is :mysql do + sql.should be_like(%Q{ + `users`.`id` IN (SELECT `users`.`id`, `users`.`name` FROM `users`) + }) + end - adapter_is_not :mysql do - sql.should be_like(%Q{ - "users"."id" IN (SELECT "users"."id", "users"."name" FROM "users") - }) + adapter_is_not :mysql do + sql.should be_like(%Q{ + "users"."id" IN (SELECT "users"."id", "users"."name" FROM "users") + }) + end end end end diff --git a/spec/arel/engines/sql/unit/predicates/predicates_spec.rb b/spec/arel/engines/sql/unit/predicates/predicates_spec.rb index fe0010a8cb..7d53351546 100644 --- a/spec/arel/engines/sql/unit/predicates/predicates_spec.rb +++ b/spec/arel/engines/sql/unit/predicates/predicates_spec.rb @@ -1,62 +1,64 @@ require 'spec_helper' module Arel - describe Predicate do - before do - @relation = Table.new(:users) - @attribute1 = @relation[:id] - @attribute2 = @relation[:name] - @operand1 = Equality.new(@attribute1, 1) - @operand2 = Equality.new(@attribute2, "name") - end + module Predicates + describe Predicate do + before do + @relation = Table.new(:users) + @attribute1 = @relation[:id] + @attribute2 = @relation[:name] + @operand1 = Equality.new(@attribute1, 1) + @operand2 = Equality.new(@attribute2, "name") + end - describe "when being combined with another predicate with AND logic" do - describe "#to_sql" do - it "manufactures sql with an AND operation" do - sql = @operand1.and(@operand2).to_sql + describe "when being combined with another predicate with AND logic" do + describe "#to_sql" do + it "manufactures sql with an AND operation" do + sql = @operand1.and(@operand2).to_sql - adapter_is :mysql do - sql.should be_like(%Q{ - (`users`.`id` = 1 AND `users`.`name` = 'name') - }) - end + adapter_is :mysql do + sql.should be_like(%Q{ + (`users`.`id` = 1 AND `users`.`name` = 'name') + }) + end - adapter_is :sqlite3 do - sql.should be_like(%Q{ - ("users"."id" = 1 AND "users"."name" = 'name') - }) - end + adapter_is :sqlite3 do + sql.should be_like(%Q{ + ("users"."id" = 1 AND "users"."name" = 'name') + }) + end - adapter_is :postgresql do - sql.should be_like(%Q{ - ("users"."id" = 1 AND "users"."name" = E'name') - }) + adapter_is :postgresql do + sql.should be_like(%Q{ + ("users"."id" = 1 AND "users"."name" = E'name') + }) + end end end end - end - describe "when being combined with another predicate with OR logic" do - describe "#to_sql" do - it "manufactures sql with an OR operation" do - sql = @operand1.or(@operand2).to_sql + describe "when being combined with another predicate with OR logic" do + describe "#to_sql" do + it "manufactures sql with an OR operation" do + sql = @operand1.or(@operand2).to_sql - adapter_is :mysql do - sql.should be_like(%Q{ - (`users`.`id` = 1 OR `users`.`name` = 'name') - }) - end + adapter_is :mysql do + sql.should be_like(%Q{ + (`users`.`id` = 1 OR `users`.`name` = 'name') + }) + end - adapter_is :sqlite3 do - sql.should be_like(%Q{ - ("users"."id" = 1 OR "users"."name" = 'name') - }) - end + adapter_is :sqlite3 do + sql.should be_like(%Q{ + ("users"."id" = 1 OR "users"."name" = 'name') + }) + end - adapter_is :postgresql do - sql.should be_like(%Q{ - ("users"."id" = 1 OR "users"."name" = E'name') - }) + adapter_is :postgresql do + sql.should be_like(%Q{ + ("users"."id" = 1 OR "users"."name" = E'name') + }) + end end end end |