Added support for RETURNING primary key when available, only for

PostgreSQL.

2 files changed, 6 insertions, 1 deletions

diff --git a/lib/arel/engines/sql/relations/compiler.rb b/lib/arel/engines/sql/relations/compiler.rb
index 4bc169096a..185f1a5c87 100644
--- a/lib/arel/engines/sql/relations/compiler.rb
+++ b/lib/arel/engines/sql/relations/compiler.rb
@@ -26,6 +26,10 @@ module Arel
         "WHERE #{quoted_primary_key} IN (SELECT #{quoted_primary_key} FROM #{engine.connection.quote_table_name table.name} #{conditions})"
       end
 
+      def supports_insert_with_returning?
+        false
+      end
+
     protected
       def method_missing(method, *args, &block)
         relation.send(method, *args, &block)
diff --git a/lib/arel/engines/sql/relations/writes.rb b/lib/arel/engines/sql/relations/writes.rb
index 30b36ddda8..00cd61cdde 100644
--- a/lib/arel/engines/sql/relations/writes.rb
+++ b/lib/arel/engines/sql/relations/writes.rb
@@ -32,7 +32,8 @@ module Arel
       build_query \
         "INSERT",
         "INTO #{table_sql}",
-        insertion_attributes_values_sql
+        insertion_attributes_values_sql,
+        ("RETURNING #{engine.quote_column_name(primary_key)}" if compiler.supports_insert_with_returning?)
     end
   end