diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-12-14 10:22:39 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-12-14 10:22:39 -0800 |
| commit | ed2e23c6b981b0a681ebe698ee107493a0e0dff3 (patch) | |
| tree | dcd4081786ad4547981d3adfb930040c6224e533 /lib/arel/nodes | |
| parent | 9653da3c7963834eb9ed93bf24837147fa9b0461 (diff) | |
| download | rails-ed2e23c6b981b0a681ebe698ee107493a0e0dff3.tar.gz rails-ed2e23c6b981b0a681ebe698ee107493a0e0dff3.tar.bz2 rails-ed2e23c6b981b0a681ebe698ee107493a0e0dff3.zip | |
fixing create_string_join factory method
Diffstat (limited to 'lib/arel/nodes')
| -rw-r--r-- | lib/arel/nodes/inner_join.rb | 4 | ||||
| -rw-r--r-- | lib/arel/nodes/select_statement.rb | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/arel/nodes/inner_join.rb b/lib/arel/nodes/inner_join.rb index bf10eeac18..d09d9e819b 100644 --- a/lib/arel/nodes/inner_join.rb +++ b/lib/arel/nodes/inner_join.rb @@ -1,6 +1,10 @@ module Arel module Nodes class InnerJoin < Arel::Nodes::Join + def initialize left, right + raise if right == Arel::Nodes::StringJoin + super + end end end end diff --git a/lib/arel/nodes/select_statement.rb b/lib/arel/nodes/select_statement.rb index 6881a66747..c9a0cde4e0 100644 --- a/lib/arel/nodes/select_statement.rb +++ b/lib/arel/nodes/select_statement.rb @@ -5,6 +5,7 @@ module Arel attr_accessor :limit, :orders, :lock, :offset def initialize cores = [SelectCore.new] + #puts caller @cores = cores @orders = [] @limit = nil |