diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-08-18 22:56:56 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-18 22:56:56 -0300 |
| commit | 40516d01f1511cb7252556111dbb1b465b65bd12 (patch) | |
| tree | 88fad095bad5b2c3881b33dc2f2141f7c73f88f1 /activerecord/lib | |
| parent | 47ff483b8b29b871cb840992649b2eb83ee91095 (diff) | |
| parent | c48630b1ce1d7cf7e6a30f1eafd28ccedcc256ed (diff) | |
| download | rails-40516d01f1511cb7252556111dbb1b465b65bd12.tar.gz rails-40516d01f1511cb7252556111dbb1b465b65bd12.tar.bz2 rails-40516d01f1511cb7252556111dbb1b465b65bd12.zip | |
Merge pull request #26197 from kamipo/remove_unnecessary_test_sql_for_insert_with_returning_disabled
Remove unnecessary `test_sql_for_insert_with_returning_disabled`
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb index 46aca2ab54..7414eba6c5 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb @@ -124,14 +124,13 @@ module ActiveRecord pk = primary_key(table_ref) if table_ref end - pk = suppress_composite_primary_key(pk) - - if pk && use_insert_returning? + if pk = suppress_composite_primary_key(pk) sql = "#{sql} RETURNING #{quote_column_name(pk)}" end super end + protected :sql_for_insert def exec_insert(sql, name = nil, binds = [], pk = nil, sequence_name = nil) if use_insert_returning? || pk == false |