From ed2e23c6b981b0a681ebe698ee107493a0e0dff3 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 14 Dec 2010 10:22:39 -0800
Subject: fixing create_string_join factory method

---
 lib/arel/nodes/inner_join.rb       | 4 ++++
 lib/arel/nodes/select_statement.rb | 1 +
 2 files changed, 5 insertions(+)

(limited to 'lib/arel/nodes')

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
-- 
cgit v1.2.3