Insertions should use insert and not execute to get a valid returning

value. Moved clasuses to Arel::Relation.

1 files changed, 27 insertions, 1 deletions

diff --git a/lib/arel/engines/sql/relations/relation.rb b/lib/arel/engines/sql/relations/relation.rb
index 5038e1db81..52b91c71ea 100644
--- a/lib/arel/engines/sql/relations/relation.rb
+++ b/lib/arel/engines/sql/relations/relation.rb
@@ -25,8 +25,34 @@ module Arel
       @primary_key ||= begin
         table.name.classify.constantize.primary_key
       rescue NameError
-        "id"
+        nil
       end
     end
+
+    protected
+
+      def from_clauses
+        sources.blank? ? table_sql(Sql::TableReference.new(self)) : sources
+      end
+
+      def select_clauses
+        attributes.collect { |a| a.to_sql(Sql::SelectClause.new(self)) }
+      end
+
+      def where_clauses
+        wheres.collect { |w| w.to_sql(Sql::WhereClause.new(self)) }
+      end
+
+      def group_clauses
+        groupings.collect { |g| g.to_sql(Sql::GroupClause.new(self)) }
+      end
+
+      def having_clauses
+        havings.collect { |g| g.to_sql(Sql::HavingClause.new(self)) }
+      end
+
+      def order_clauses
+        orders.collect { |o| o.to_sql(Sql::OrderClause.new(self)) }
+      end
   end
 end