aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/migration/join_table.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record/migration/join_table.rb')
-rw-r--r--activerecord/lib/active_record/migration/join_table.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/migration/join_table.rb b/activerecord/lib/active_record/migration/join_table.rb
index 01a580781b..e880ae97bb 100644
--- a/activerecord/lib/active_record/migration/join_table.rb
+++ b/activerecord/lib/active_record/migration/join_table.rb
@@ -4,13 +4,11 @@ module ActiveRecord
private
def find_join_table_name(table_1, table_2, options = {})
- options.delete(:table_name) { join_table_name(table_1, table_2) }
+ options.delete(:table_name) || join_table_name(table_1, table_2)
end
def join_table_name(table_1, table_2)
- tables_names = [table_1, table_2].map(&:to_s).sort
-
- tables_names.join("_").to_sym
+ [table_1, table_2].sort.join("_").to_sym
end
end
end