aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-07-08 16:53:37 +0200
committerXavier Noria <fxn@hashref.com>2010-07-08 16:53:37 +0200
commita9587935dec6b5de01d51553ecc6d4157a8ec173 (patch)
tree521fa7e0516924e3d762234180514788f15a178d /activerecord/lib/active_record/connection_adapters/abstract
parent4a1207d54077348b67fad95ffde5710cf0be31bd (diff)
downloadrails-a9587935dec6b5de01d51553ecc6d4157a8ec173.tar.gz
rails-a9587935dec6b5de01d51553ecc6d4157a8ec173.tar.bz2
rails-a9587935dec6b5de01d51553ecc6d4157a8ec173.zip
copy-edits some docs
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb11
1 files changed, 5 insertions, 6 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 555a611e68..ffc3847a31 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -103,15 +103,14 @@ module ActiveRecord
# The +options+ hash can include the following keys:
# [<tt>:id</tt>]
# Whether to automatically add a primary key column. Defaults to true.
- # Join tables for +has_and_belongs_to_many+ should set <tt>:id => false</tt>.
+ # Join tables for +has_and_belongs_to_many+ should set it to false.
# [<tt>:primary_key</tt>]
# The name of the primary key, if one is to be added automatically.
- # Defaults to +id+. You must NOT pass :id => false otherwise :primary_key option
- # will have no effect.
+ # Defaults to +id+. If <tt>:id</tt> is false this option is ignored.
#
- # Also note that this just sets the primary_key in the table. You still need to
- # add :set_primary_key => '' in the model to tell model what column is the
- # primary_key. Models do NOT auto-detect the primary_key from table defintion.
+ # Also note that this just sets the primary key in the table. You additionally
+ # need to configure the primary key in the model via the +set_primary_key+ macro.
+ # Models do NOT auto-detect the primary key from their table definition.
#
# [<tt>:options</tt>]
# Any extra options you want appended to the table definition.