aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-07-20 02:03:53 -0300
committerGitHub <noreply@github.com>2016-07-20 02:03:53 -0300
commitb25e18007b4dc139c86cb027552c007658a6fbfa (patch)
treece92a98494980f95ae16af353ce6bc1c8a2612f3 /activerecord/lib
parentcc22c9eae3ebfb7505e91ec5a77456ce5d6ada3c (diff)
parent872350a54f84dc9ddf19dfe2ae390f5245992166 (diff)
downloadrails-b25e18007b4dc139c86cb027552c007658a6fbfa.tar.gz
rails-b25e18007b4dc139c86cb027552c007658a6fbfa.tar.bz2
rails-b25e18007b4dc139c86cb027552c007658a6fbfa.zip
Merge pull request #25828 from bogdanvlviv/ref_default_sequence_name
Refactored method `ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaStatements#default_sequence_name`. Refactored test `HasManyAssociationsTest#test_do_not_call_callbacks_for_delete_all`.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
index 45507e206a..cc606e4828 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
@@ -327,12 +327,12 @@ module ActiveRecord
end
# Returns the sequence name for a table's primary key or some other specified key.
- def default_sequence_name(table_name, pk = nil) #:nodoc:
- result = serial_sequence(table_name, pk || 'id')
+ def default_sequence_name(table_name, pk = 'id') #:nodoc:
+ result = serial_sequence(table_name, pk)
return nil unless result
Utils.extract_schema_qualified_name(result).to_s
rescue ActiveRecord::StatementInvalid
- PostgreSQL::Name.new(nil, "#{table_name}_#{pk || 'id'}_seq").to_s
+ PostgreSQL::Name.new(nil, "#{table_name}_#{pk}_seq").to_s
end
def serial_sequence(table, column)