From 0644f9f3a0878193ac9ba3720d406da97b789a9d Mon Sep 17 00:00:00 2001
From: Vipul A M <vipulnsward@gmail.com>
Date: Sun, 15 Jun 2014 01:08:38 +0530
Subject: Rename ambiguous test name to what it actually tests
---
test/test_select_manager.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'test')
diff --git a/test/test_select_manager.rb b/test/test_select_manager.rb
index 4678901bb4..59b000d654 100644
--- a/test/test_select_manager.rb
+++ b/test/test_select_manager.rb
@@ -140,7 +140,7 @@ module Arel
mgr.to_sql.must_be_like %{ SELECT FROM "users" INNER JOIN "users" "users_2" ON omg }
end
- it 'converts to sqlliterals' do
+ it 'converts to sqlliterals with multiple items' do
table = Table.new :users
right = table.alias
mgr = table.from table
--
cgit v1.2.3
From 43d1497cba60e2c788f0494933f92859f72eae3c Mon Sep 17 00:00:00 2001
From: Vipul A M <vipulnsward@gmail.com>
Date: Sun, 15 Jun 2014 13:47:53 +0530
Subject: - Stop passing redundant `:engine => Table.engine` to `Table#new` -
Remove redundant `ast` variable creation - Rename similar join tests name to
what they actually test - Move "joins itself" test to "joins" describe
instead of defining describe block twice - Move update manager statement
tests in logical order - Move `project` tests in logical order
---
test/test_select_manager.rb | 103 ++++++++++++++++++++++----------------------
1 file changed, 52 insertions(+), 51 deletions(-)
(limited to 'test')
diff --git a/test/test_select_manager.rb b/test/test_select_manager.rb
index 59b000d654..8880e325e4 100644
--- a/test/test_select_manager.rb
+++ b/test/test_select_manager.rb
@@ -152,7 +152,7 @@ module Arel
describe 'clone' do
it 'creates new cores' do
- table = Table.new :users, :engine => Table.engine, :as => 'foo'
+ table = Table.new :users, :as => 'foo'
mgr = table.from table
m2 = mgr.clone
m2.project "foo"
@@ -160,7 +160,7 @@ module Arel
end
it 'makes updates to the correct copy' do
- table = Table.new :users, :engine => Table.engine, :as => 'foo'
+ table = Table.new :users, :as => 'foo'
mgr = table.from table
m2 = mgr.clone
m3 = m2.clone
@@ -172,7 +172,7 @@ module Arel
describe 'initialize' do
it 'uses alias in sql' do
- table = Table.new :users, :engine => Table.engine, :as => 'foo'
+ table = Table.new :users, :as => 'foo'
mgr = table.from table
mgr.skip 10
mgr.to_sql.must_be_like %{ SELECT FROM "users" "foo" OFFSET 10 }
@@ -382,8 +382,7 @@ module Arel
it 'should return the ast' do
table = Table.new :users
mgr = table.from table
- ast = mgr.ast
- assert ast
+ assert mgr.ast
end
it 'should allow orders to work when the ast is grepped' do
@@ -532,7 +531,7 @@ module Arel
assert_equal 'bar', join.right
end
- it 'should create join nodes with a klass' do
+ it 'should create join nodes with a full outer join klass' do
relation = Arel::SelectManager.new Table.engine
join = relation.create_join 'foo', 'bar', Arel::Nodes::FullOuterJoin
assert_kind_of Arel::Nodes::FullOuterJoin, join
@@ -540,7 +539,7 @@ module Arel
assert_equal 'bar', join.right
end
- it 'should create join nodes with a klass' do
+ it 'should create join nodes with a outer join klass' do
relation = Arel::SelectManager.new Table.engine
join = relation.create_join 'foo', 'bar', Arel::Nodes::OuterJoin
assert_kind_of Arel::Nodes::OuterJoin, join
@@ -548,7 +547,7 @@ module Arel
assert_equal 'bar', join.right
end
- it 'should create join nodes with a klass' do
+ it 'should create join nodes with a right outer join klass' do
relation = Arel::SelectManager.new Table.engine
join = relation.create_join 'foo', 'bar', Arel::Nodes::RightOuterJoin
assert_kind_of Arel::Nodes::RightOuterJoin, join
@@ -616,7 +615,8 @@ module Arel
end
describe 'joins' do
- it 'returns join sql' do
+
+ it 'returns inner join sql' do
table = Table.new :users
aliaz = table.alias
manager = Arel::SelectManager.new Table.engine
@@ -651,6 +651,22 @@ module Arel
}
end
+ it "joins itself" do
+ left = Table.new :users
+ right = left.alias
+ predicate = left[:id].eq(right[:id])
+
+ mgr = left.join(right)
+ mgr.project Nodes::SqlLiteral.new('*')
+ mgr.on(predicate).must_equal mgr
+
+ mgr.to_sql.must_be_like %{
+ SELECT * FROM "users"
+ INNER JOIN "users" "users_2"
+ ON "users"."id" = "users_2"."id"
+ }
+ end
+
it 'returns string join sql' do
manager = Arel::SelectManager.new Table.engine
manager.from Nodes::StringJoin.new(Nodes.build_quoted('hello'))
@@ -892,6 +908,27 @@ module Arel
end
describe 'update' do
+
+ it 'creates an update statement' do
+ table = Table.new :users
+ manager = Arel::SelectManager.new Table.engine
+ manager.from table
+ stmt = manager.compile_update({table[:id] => 1}, Arel::Attributes::Attribute.new(table, 'id'))
+
+ stmt.to_sql.must_be_like %{
+ UPDATE "users" SET "id" = 1
+ }
+ end
+
+ it 'takes a string' do
+ table = Table.new :users
+ manager = Arel::SelectManager.new Table.engine
+ manager.from table
+ stmt = manager.compile_update(Nodes::SqlLiteral.new('foo = bar'), Arel::Attributes::Attribute.new(table, 'id'))
+
+ stmt.to_sql.must_be_like %{ UPDATE "users" SET foo = bar }
+ end
+
it 'copies limits' do
table = Table.new :users
manager = Arel::SelectManager.new Table.engine
@@ -920,15 +957,6 @@ module Arel
}
end
- it 'takes a string' do
- table = Table.new :users
- manager = Arel::SelectManager.new Table.engine
- manager.from table
- stmt = manager.compile_update(Nodes::SqlLiteral.new('foo = bar'), Arel::Attributes::Attribute.new(table, 'id'))
-
- stmt.to_sql.must_be_like %{ UPDATE "users" SET foo = bar }
- end
-
it 'copies where clauses' do
table = Table.new :users
manager = Arel::SelectManager.new Table.engine
@@ -954,19 +982,15 @@ module Arel
}
end
- it 'executes an update statement' do
- table = Table.new :users
- manager = Arel::SelectManager.new Table.engine
- manager.from table
- stmt = manager.compile_update({table[:id] => 1}, Arel::Attributes::Attribute.new(table, 'id'))
-
- stmt.to_sql.must_be_like %{
- UPDATE "users" SET "id" = 1
- }
- end
end
describe 'project' do
+ it "takes sql literals" do
+ manager = Arel::SelectManager.new Table.engine
+ manager.project Nodes::SqlLiteral.new '*'
+ manager.to_sql.must_be_like %{ SELECT * }
+ end
+
it 'takes multiple args' do
manager = Arel::SelectManager.new Table.engine
manager.project Nodes::SqlLiteral.new('foo'),
@@ -980,11 +1004,6 @@ module Arel
manager.to_sql.must_be_like %{ SELECT * }
end
- it "takes sql literals" do
- manager = Arel::SelectManager.new Table.engine
- manager.project Nodes::SqlLiteral.new '*'
- manager.to_sql.must_be_like %{ SELECT * }
- end
end
describe 'projections' do
@@ -1056,24 +1075,6 @@ module Arel
end
end
- describe "join" do
- it "joins itself" do
- left = Table.new :users
- right = left.alias
- predicate = left[:id].eq(right[:id])
-
- mgr = left.join(right)
- mgr.project Nodes::SqlLiteral.new('*')
- mgr.on(predicate).must_equal mgr
-
- mgr.to_sql.must_be_like %{
- SELECT * FROM "users"
- INNER JOIN "users" "users_2"
- ON "users"."id" = "users_2"."id"
- }
- end
- end
-
describe 'from' do
it "makes sql" do
table = Table.new :users
--
cgit v1.2.3