aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-08-17 00:12:31 -0300
committerGitHub <noreply@github.com>2016-08-17 00:12:31 -0300
commitc1582589f8a3c2b3621017ec40293d131ff694cb (patch)
treefee97922ab19e4996a0c5f195461545abc525594 /activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
parent1c9c315e5c352412b95596510facbd2a5aea9e12 (diff)
parent2ed25b31d423384219c7fa6d55e82d5327c14157 (diff)
downloadrails-c1582589f8a3c2b3621017ec40293d131ff694cb.tar.gz
rails-c1582589f8a3c2b3621017ec40293d131ff694cb.tar.bz2
rails-c1582589f8a3c2b3621017ec40293d131ff694cb.zip
Merge pull request #26002 from kamipo/sql_for_insert_should_be_called_inside_exec_insert
`sql_for_insert` should be called inside `exec_insert`
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb')
-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 4a1e1f0ffc..126047584e 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
@@ -90,6 +90,7 @@ module ActiveRecord
# +binds+ as the bind substitutes. +name+ is logged along with
# the executed +sql+ statement.
def exec_insert(sql, name = nil, binds = [], pk = nil, sequence_name = nil)
+ sql, binds = sql_for_insert(sql, pk, nil, sequence_name, binds)
exec_query(sql, name, binds)
end
@@ -121,8 +122,7 @@ module ActiveRecord
# If the next id was calculated in advance (as in Oracle), it should be
# passed in as +id_value+.
def insert(arel, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [])
- sql, binds, pk, sequence_name = sql_for_insert(to_sql(arel, binds), pk, id_value, sequence_name, binds)
- value = exec_insert(sql, name, binds, pk, sequence_name)
+ value = exec_insert(to_sql(arel, binds), name, binds, pk, sequence_name)
id_value || last_inserted_id(value)
end
alias create insert