diff options
| -rw-r--r-- | Manifest.txt | 1 | ||||
| -rw-r--r-- | lib/arel.rb | 1 | ||||
| -rw-r--r-- | lib/arel/factory_methods.rb | 9 | ||||
| -rw-r--r-- | lib/arel/nodes/string_join.rb | 4 | ||||
| -rw-r--r-- | lib/arel/table.rb | 7 | ||||
| -rw-r--r-- | lib/arel/tree_manager.rb | 1 | ||||
| -rw-r--r-- | test/test_select_manager.rb | 18 | ||||
| -rw-r--r-- | test/test_table.rb | 16 |
8 files changed, 52 insertions, 5 deletions
diff --git a/Manifest.txt b/Manifest.txt index 095d3c276e..e60978a947 100644 --- a/Manifest.txt +++ b/Manifest.txt @@ -14,6 +14,7 @@ lib/arel/delete_manager.rb lib/arel/deprecated.rb lib/arel/expression.rb lib/arel/expressions.rb +lib/arel/factory_methods.rb lib/arel/insert_manager.rb lib/arel/nodes.rb lib/arel/nodes/and.rb diff --git a/lib/arel.rb b/lib/arel.rb index 6a8d9571d1..3d0648263b 100644 --- a/lib/arel.rb +++ b/lib/arel.rb @@ -1,4 +1,5 @@ require 'arel/crud' +require 'arel/factory_methods' require 'arel/expressions' require 'arel/predications' diff --git a/lib/arel/factory_methods.rb b/lib/arel/factory_methods.rb new file mode 100644 index 0000000000..23d668c8e5 --- /dev/null +++ b/lib/arel/factory_methods.rb @@ -0,0 +1,9 @@ +module Arel + ### + # Methods for creating various nodes + module FactoryMethods + def create_join from, to, on = nil, klass = Nodes::InnerJoin + klass.new(from, to, on) + end + end +end diff --git a/lib/arel/nodes/string_join.rb b/lib/arel/nodes/string_join.rb index ea7912f92b..b24e91b6b8 100644 --- a/lib/arel/nodes/string_join.rb +++ b/lib/arel/nodes/string_join.rb @@ -3,8 +3,8 @@ module Arel class StringJoin < Arel::Nodes::Join undef :constraint - def initialize left, right - super(left, right, nil) + def initialize left, right, on = nil + super end end end diff --git a/lib/arel/table.rb b/lib/arel/table.rb index e7a626a4c6..ceb81705b3 100644 --- a/lib/arel/table.rb +++ b/lib/arel/table.rb @@ -1,6 +1,7 @@ module Arel class Table include Arel::Crud + include Arel::FactoryMethods @engine = nil class << self; attr_accessor :engine; end @@ -57,10 +58,10 @@ module Arel case relation when String, Nodes::SqlLiteral raise if relation.blank? - from Nodes::StringJoin.new(self, relation) - else - from klass.new(self, relation, nil) + klass = Nodes::StringJoin end + + from create_join(self, relation, nil, klass) end def group *columns diff --git a/lib/arel/tree_manager.rb b/lib/arel/tree_manager.rb index 2fa770a0e3..5722baca77 100644 --- a/lib/arel/tree_manager.rb +++ b/lib/arel/tree_manager.rb @@ -2,6 +2,7 @@ module Arel class TreeManager # FIXME: Remove this. include Arel::Relation + include Arel::FactoryMethods attr_accessor :visitor attr_reader :ast, :engine diff --git a/test/test_select_manager.rb b/test/test_select_manager.rb index 826832c5ab..2b88022ca3 100644 --- a/test/test_select_manager.rb +++ b/test/test_select_manager.rb @@ -277,6 +277,24 @@ module Arel end end + it 'should create join nodes' do + relation = Arel::SelectManager.new Table.engine + join = relation.create_join 'foo', 'bar', 'baz' + assert_kind_of Arel::Nodes::InnerJoin, join + assert_equal 'foo', join.left + assert_equal 'bar', join.right + assert_equal 'baz', join.constraint + end + + it 'should create join nodes with a klass' do + relation = Arel::SelectManager.new Table.engine + join = relation.create_join 'foo', 'bar', 'baz', Arel::Nodes::OuterJoin + assert_kind_of Arel::Nodes::OuterJoin, join + assert_equal 'foo', join.left + assert_equal 'bar', join.right + assert_equal 'baz', join.constraint + end + describe 'join' do it 'responds to join' do left = Table.new :users diff --git a/test/test_table.rb b/test/test_table.rb index bb7bd255fd..7d773b2e2b 100644 --- a/test/test_table.rb +++ b/test/test_table.rb @@ -6,6 +6,22 @@ module Arel @relation = Table.new(:users) end + it 'should create join nodes' do + join = @relation.create_join 'foo', 'bar', 'baz' + assert_kind_of Arel::Nodes::InnerJoin, join + assert_equal 'foo', join.left + assert_equal 'bar', join.right + assert_equal 'baz', join.constraint + end + + it 'should create join nodes with a klass' do + join = @relation.create_join 'foo', 'bar', 'baz', Arel::Nodes::OuterJoin + assert_kind_of Arel::Nodes::OuterJoin, join + assert_equal 'foo', join.left + assert_equal 'bar', join.right + assert_equal 'baz', join.constraint + end + it 'should return an insert manager' do im = @relation.compile_insert 'VALUES(NULL)' assert_kind_of Arel::InsertManager, im |