aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/attributes/test_attribute.rb258
-rw-r--r--test/test_select_manager.rb6
-rw-r--r--test/visitors/test_to_sql.rb24
3 files changed, 143 insertions, 145 deletions
diff --git a/test/attributes/test_attribute.rb b/test/attributes/test_attribute.rb
index 0851a07258..500f9385f8 100644
--- a/test/attributes/test_attribute.rb
+++ b/test/attributes/test_attribute.rb
@@ -548,84 +548,84 @@ module Arel
end
end
- describe '#in' do
- it 'can be constructed with a subquery' do
- relation = Table.new(:users)
- mgr = relation.project relation[:id]
- mgr.where relation[:name].does_not_match_all(['%chunky%','%bacon%'])
+ describe 'with a range' do
+ it 'can be constructed with a standard range' do
attribute = Attribute.new nil, nil
+ node = attribute.between(1..3)
- node = attribute.in(mgr)
-
- node.must_equal Nodes::In.new(attribute, mgr.ast)
+ node.must_equal Nodes::Between.new(
+ attribute,
+ Nodes::And.new([
+ Nodes::Casted.new(1, attribute),
+ Nodes::Casted.new(3, attribute)
+ ])
+ )
end
- describe 'with a range' do
- it 'can be constructed with a standard range' do
- attribute = Attribute.new nil, nil
- node = attribute.in(1..3)
+ it 'can be constructed with a range starting from -Infinity' do
+ attribute = Attribute.new nil, nil
+ node = attribute.between(-::Float::INFINITY..3)
- node.must_equal Nodes::Between.new(
- attribute,
- Nodes::And.new([
- Nodes::Casted.new(1, attribute),
- Nodes::Casted.new(3, attribute)
- ])
- )
- end
+ node.must_equal Nodes::LessThanOrEqual.new(
+ attribute,
+ Nodes::Casted.new(3, attribute)
+ )
+ end
- it 'can be constructed with a range starting from -Infinity' do
- attribute = Attribute.new nil, nil
- node = attribute.in(-::Float::INFINITY..3)
+ it 'can be constructed with an exclusive range starting from -Infinity' do
+ attribute = Attribute.new nil, nil
+ node = attribute.between(-::Float::INFINITY...3)
- node.must_equal Nodes::LessThanOrEqual.new(
- attribute,
- Nodes::Casted.new(3, attribute)
- )
- end
+ node.must_equal Nodes::LessThan.new(
+ attribute,
+ Nodes::Casted.new(3, attribute)
+ )
+ end
- it 'can be constructed with an exclusive range starting from -Infinity' do
- attribute = Attribute.new nil, nil
- node = attribute.in(-::Float::INFINITY...3)
+ it 'can be constructed with an infinite range' do
+ attribute = Attribute.new nil, nil
+ node = attribute.between(-::Float::INFINITY..::Float::INFINITY)
- node.must_equal Nodes::LessThan.new(
- attribute,
- Nodes::Casted.new(3, attribute)
- )
- end
+ node.must_equal Nodes::NotIn.new(attribute, [])
+ end
- it 'can be constructed with an infinite range' do
- attribute = Attribute.new nil, nil
- node = attribute.in(-::Float::INFINITY..::Float::INFINITY)
+ it 'can be constructed with a range ending at Infinity' do
+ attribute = Attribute.new nil, nil
+ node = attribute.between(0..::Float::INFINITY)
- node.must_equal Nodes::NotIn.new(attribute, [])
- end
+ node.must_equal Nodes::GreaterThanOrEqual.new(
+ attribute,
+ Nodes::Casted.new(0, attribute)
+ )
+ end
- it 'can be constructed with a range ending at Infinity' do
- attribute = Attribute.new nil, nil
- node = attribute.in(0..::Float::INFINITY)
+ it 'can be constructed with an exclusive range' do
+ attribute = Attribute.new nil, nil
+ node = attribute.between(0...3)
- node.must_equal Nodes::GreaterThanOrEqual.new(
+ node.must_equal Nodes::And.new([
+ Nodes::GreaterThanOrEqual.new(
attribute,
Nodes::Casted.new(0, attribute)
+ ),
+ Nodes::LessThan.new(
+ attribute,
+ Nodes::Casted.new(3, attribute)
)
- end
-
- it 'can be constructed with an exclusive range' do
- attribute = Attribute.new nil, nil
- node = attribute.in(0...3)
-
- node.must_equal Nodes::And.new([
- Nodes::GreaterThanOrEqual.new(
- attribute,
- Nodes::Casted.new(0, attribute)
- ),
- Nodes::LessThan.new(
- attribute,
- Nodes::Casted.new(3, attribute)
- )
- ])
- end
+ ])
+ end
+ end
+
+ describe '#in' do
+ it 'can be constructed with a subquery' do
+ relation = Table.new(:users)
+ mgr = relation.project relation[:id]
+ mgr.where relation[:name].does_not_match_all(['%chunky%','%bacon%'])
+ attribute = Attribute.new nil, nil
+
+ node = attribute.in(mgr)
+
+ node.must_equal Nodes::In.new(attribute, mgr.ast)
end
it 'can be constructed with a list' do
@@ -695,87 +695,87 @@ module Arel
end
end
- describe '#not_in' do
- it 'can be constructed with a subquery' do
- relation = Table.new(:users)
- mgr = relation.project relation[:id]
- mgr.where relation[:name].does_not_match_all(['%chunky%','%bacon%'])
+ describe 'with a range' do
+ it 'can be constructed with a standard range' do
attribute = Attribute.new nil, nil
+ node = attribute.not_between(1..3)
- node = attribute.not_in(mgr)
-
- node.must_equal Nodes::NotIn.new(attribute, mgr.ast)
- end
-
- describe 'with a range' do
- it 'can be constructed with a standard range' do
- attribute = Attribute.new nil, nil
- node = attribute.not_in(1..3)
-
- node.must_equal Nodes::Grouping.new(Nodes::Or.new(
- Nodes::LessThan.new(
- attribute,
- Nodes::Casted.new(1, attribute)
- ),
- Nodes::GreaterThan.new(
- attribute,
- Nodes::Casted.new(3, attribute)
- )
- ))
- end
-
- it 'can be constructed with a range starting from -Infinity' do
- attribute = Attribute.new nil, nil
- node = attribute.not_in(-::Float::INFINITY..3)
-
- node.must_equal Nodes::GreaterThan.new(
+ node.must_equal Nodes::Grouping.new(Nodes::Or.new(
+ Nodes::LessThan.new(
+ attribute,
+ Nodes::Casted.new(1, attribute)
+ ),
+ Nodes::GreaterThan.new(
attribute,
Nodes::Casted.new(3, attribute)
)
- end
+ ))
+ end
- it 'can be constructed with an exclusive range starting from -Infinity' do
- attribute = Attribute.new nil, nil
- node = attribute.not_in(-::Float::INFINITY...3)
+ it 'can be constructed with a range starting from -Infinity' do
+ attribute = Attribute.new nil, nil
+ node = attribute.not_between(-::Float::INFINITY..3)
- node.must_equal Nodes::GreaterThanOrEqual.new(
- attribute,
- Nodes::Casted.new(3, attribute)
- )
- end
+ node.must_equal Nodes::GreaterThan.new(
+ attribute,
+ Nodes::Casted.new(3, attribute)
+ )
+ end
+
+ it 'can be constructed with an exclusive range starting from -Infinity' do
+ attribute = Attribute.new nil, nil
+ node = attribute.not_between(-::Float::INFINITY...3)
+
+ node.must_equal Nodes::GreaterThanOrEqual.new(
+ attribute,
+ Nodes::Casted.new(3, attribute)
+ )
+ end
- it 'can be constructed with an infinite range' do
- attribute = Attribute.new nil, nil
- node = attribute.not_in(-::Float::INFINITY..::Float::INFINITY)
+ it 'can be constructed with an infinite range' do
+ attribute = Attribute.new nil, nil
+ node = attribute.not_between(-::Float::INFINITY..::Float::INFINITY)
- node.must_equal Nodes::In.new(attribute, [])
- end
+ node.must_equal Nodes::In.new(attribute, [])
+ end
- it 'can be constructed with a range ending at Infinity' do
- attribute = Attribute.new nil, nil
- node = attribute.not_in(0..::Float::INFINITY)
+ it 'can be constructed with a range ending at Infinity' do
+ attribute = Attribute.new nil, nil
+ node = attribute.not_between(0..::Float::INFINITY)
- node.must_equal Nodes::LessThan.new(
+ node.must_equal Nodes::LessThan.new(
+ attribute,
+ Nodes::Casted.new(0, attribute)
+ )
+ end
+
+ it 'can be constructed with an exclusive range' do
+ attribute = Attribute.new nil, nil
+ node = attribute.not_between(0...3)
+
+ node.must_equal Nodes::Grouping.new(Nodes::Or.new(
+ Nodes::LessThan.new(
attribute,
Nodes::Casted.new(0, attribute)
+ ),
+ Nodes::GreaterThanOrEqual.new(
+ attribute,
+ Nodes::Casted.new(3, attribute)
)
- end
-
- it 'can be constructed with an exclusive range' do
- attribute = Attribute.new nil, nil
- node = attribute.not_in(0...3)
-
- node.must_equal Nodes::Grouping.new(Nodes::Or.new(
- Nodes::LessThan.new(
- attribute,
- Nodes::Casted.new(0, attribute)
- ),
- Nodes::GreaterThanOrEqual.new(
- attribute,
- Nodes::Casted.new(3, attribute)
- )
- ))
- end
+ ))
+ end
+ end
+
+ describe '#not_in' do
+ it 'can be constructed with a subquery' do
+ relation = Table.new(:users)
+ mgr = relation.project relation[:id]
+ mgr.where relation[:name].does_not_match_all(['%chunky%','%bacon%'])
+ attribute = Attribute.new nil, nil
+
+ node = attribute.not_in(mgr)
+
+ node.must_equal Nodes::NotIn.new(attribute, mgr.ast)
end
it 'can be constructed with a list' do
diff --git a/test/test_select_manager.rb b/test/test_select_manager.rb
index 1ffb56fd9f..78b3a25928 100644
--- a/test/test_select_manager.rb
+++ b/test/test_select_manager.rb
@@ -307,13 +307,11 @@ module Arel
table = Table.new :users
@m1 = Arel::SelectManager.new Table.engine, table
@m1.project Arel.star
- @m1.where(table[:age].in(18..60))
+ @m1.where(table[:age].between(18..60))
@m2 = Arel::SelectManager.new Table.engine, table
@m2.project Arel.star
- @m2.where(table[:age].in(40..99))
-
-
+ @m2.where(table[:age].between(40..99))
end
it 'should except two managers' do
diff --git a/test/visitors/test_to_sql.rb b/test/visitors/test_to_sql.rb
index 62e1c57c73..9c18d74827 100644
--- a/test/visitors/test_to_sql.rb
+++ b/test/visitors/test_to_sql.rb
@@ -375,33 +375,33 @@ module Arel
end
it 'can handle two dot ranges' do
- node = @attr.in 1..3
+ node = @attr.between 1..3
compile(node).must_be_like %{
"users"."id" BETWEEN 1 AND 3
}
end
it 'can handle three dot ranges' do
- node = @attr.in 1...3
+ node = @attr.between 1...3
compile(node).must_be_like %{
"users"."id" >= 1 AND "users"."id" < 3
}
end
it 'can handle ranges bounded by infinity' do
- node = @attr.in 1..Float::INFINITY
+ node = @attr.between 1..Float::INFINITY
compile(node).must_be_like %{
"users"."id" >= 1
}
- node = @attr.in(-Float::INFINITY..3)
+ node = @attr.between(-Float::INFINITY..3)
compile(node).must_be_like %{
"users"."id" <= 3
}
- node = @attr.in(-Float::INFINITY...3)
+ node = @attr.between(-Float::INFINITY...3)
compile(node).must_be_like %{
"users"."id" < 3
}
- node = @attr.in(-Float::INFINITY..Float::INFINITY)
+ node = @attr.between(-Float::INFINITY..Float::INFINITY)
compile(node).must_be_like %{1=1}
end
@@ -479,33 +479,33 @@ module Arel
end
it 'can handle two dot ranges' do
- node = @attr.not_in 1..3
+ node = @attr.not_between 1..3
compile(node).must_equal(
%{("users"."id" < 1 OR "users"."id" > 3)}
)
end
it 'can handle three dot ranges' do
- node = @attr.not_in 1...3
+ node = @attr.not_between 1...3
compile(node).must_equal(
%{("users"."id" < 1 OR "users"."id" >= 3)}
)
end
it 'can handle ranges bounded by infinity' do
- node = @attr.not_in 1..Float::INFINITY
+ node = @attr.not_between 1..Float::INFINITY
compile(node).must_be_like %{
"users"."id" < 1
}
- node = @attr.not_in(-Float::INFINITY..3)
+ node = @attr.not_between(-Float::INFINITY..3)
compile(node).must_be_like %{
"users"."id" > 3
}
- node = @attr.not_in(-Float::INFINITY...3)
+ node = @attr.not_between(-Float::INFINITY...3)
compile(node).must_be_like %{
"users"."id" >= 3
}
- node = @attr.not_in(-Float::INFINITY..Float::INFINITY)
+ node = @attr.not_between(-Float::INFINITY..Float::INFINITY)
compile(node).must_be_like %{1=0}
end
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 15:44:40 +0000