diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2018-04-20 13:01:19 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-20 13:01:19 -0400 |
commit | e3e7821981a2624969c495b1c7e1dc7a139aec72 (patch) | |
tree | 4501f9cc26e4c74087c59d50a827fcd86a18f633 /activerecord | |
parent | 248197370c8cc30adf1c2366aea58db6dfb3619b (diff) | |
parent | 947c38da04ae9c57f2f29e03b9894119d21a19f6 (diff) | |
download | rails-e3e7821981a2624969c495b1c7e1dc7a139aec72.tar.gz rails-e3e7821981a2624969c495b1c7e1dc7a139aec72.tar.bz2 rails-e3e7821981a2624969c495b1c7e1dc7a139aec72.zip |
Merge pull request #32667 from yahonda/mod_empty_insert_statement_value
Allow `primary_key` argument to `empty_insert_statement_value`
Diffstat (limited to 'activerecord')
3 files changed, 3 insertions, 3 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 08f3e15a4b..41553cfa83 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb @@ -385,7 +385,7 @@ module ActiveRecord end end - def empty_insert_statement_value + def empty_insert_statement_value(primary_key = nil) "DEFAULT VALUES" end diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index fbedddd7f9..477b09944f 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -223,7 +223,7 @@ module ActiveRecord end end - def empty_insert_statement_value + def empty_insert_statement_value(primary_key = nil) "VALUES ()" end diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb index 7721e6b691..c2393c1fc8 100644 --- a/activerecord/lib/active_record/persistence.rb +++ b/activerecord/lib/active_record/persistence.rb @@ -178,7 +178,7 @@ module ActiveRecord end if values.empty? - im = arel_table.compile_insert(connection.empty_insert_statement_value) + im = arel_table.compile_insert(connection.empty_insert_statement_value(primary_key)) im.into arel_table else im = arel_table.compile_insert(_substitute_values(values)) |