aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-06-21 05:28:41 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-06-21 05:28:41 -0700
commit12fe66b56479abc2ca399c002d38a7e81fce2eb2 (patch)
tree7e182ff10ea00e58d13b810d0f5040a3e6f1e093
parent27139aed33dc875eaee75e23b21f972b1861fec3 (diff)
parent56ddb8917d62681c7e056f5386305d32c2484ba5 (diff)
downloadrails-12fe66b56479abc2ca399c002d38a7e81fce2eb2.tar.gz
rails-12fe66b56479abc2ca399c002d38a7e81fce2eb2.tar.bz2
rails-12fe66b56479abc2ca399c002d38a7e81fce2eb2.zip
Merge pull request #11040 from satococoa/fix-create_join_table-document
Fix documents for create_join_table [ci skip]
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb4
-rw-r--r--guides/source/migrations.md4
2 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 3ac55a0f11..9a1923dec5 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -214,8 +214,8 @@ module ActiveRecord
# its block form to do so yourself:
#
# create_join_table :products, :categories do |t|
- # t.index :products
- # t.index :categories
+ # t.index :product_id
+ # t.index :category_id
# end
#
# ====== Add a backend specific option to the generated SQL (MySQL)
diff --git a/guides/source/migrations.md b/guides/source/migrations.md
index eb0cfd9451..508e52a77c 100644
--- a/guides/source/migrations.md
+++ b/guides/source/migrations.md
@@ -390,8 +390,8 @@ will create a `categorization` table.
```ruby
create_join_table :products, :categories do |t|
- t.index :products
- t.index :categories
+ t.index :product_id
+ t.index :category_id
end
```