aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-04-27 08:50:07 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-04-27 08:50:07 -0700
commit8de4d71f5dab243f2c66e1695ccfabc0bbf98c9b (patch)
treeacc4aa26189620f7f7c625bbf5d45499b436bc2b /activerecord/lib/active_record/connection_adapters/abstract
parent3981a687f949f7b7b2c36d9dd15aa00e1542116d (diff)
parentcd6ddc865a68d126a845d03337e1c7f775588db2 (diff)
downloadrails-8de4d71f5dab243f2c66e1695ccfabc0bbf98c9b.tar.gz
rails-8de4d71f5dab243f2c66e1695ccfabc0bbf98c9b.tar.bz2
rails-8de4d71f5dab243f2c66e1695ccfabc0bbf98c9b.zip
Merge pull request #5698 from dougcole/support_postgresql_partitioning
Support postgresql partitioning by making INSERT RETURNING optional
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
index be712f2334..7b2961a04a 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
@@ -59,7 +59,7 @@ module ActiveRecord
# Executes insert +sql+ statement in the context of this connection using
# +binds+ as the bind substitutes. +name+ is logged along with
# the executed +sql+ statement.
- def exec_insert(sql, name, binds)
+ def exec_insert(sql, name, binds, pk = nil, sequence_name = nil)
exec_query(sql, name, binds)
end
@@ -87,7 +87,7 @@ module ActiveRecord
# passed in as +id_value+.
def insert(arel, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [])
sql, binds = sql_for_insert(to_sql(arel, binds), pk, id_value, sequence_name, binds)
- value = exec_insert(sql, name, binds)
+ value = exec_insert(sql, name, binds, pk, sequence_name)
id_value || last_inserted_id(value)
end