diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-07-09 22:08:24 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-07-09 22:08:24 +0200 |
| commit | 2f04c8785540597b02a265324c91267f09ddd07c (patch) | |
| tree | 0cb9aea2110507b4f525302e1babc998b8cc801e /activerecord/lib | |
| parent | c9ae2c11ebbf42d887dced2938a59e8d0634d60a (diff) | |
| parent | c6f4c5916ef467814d970c70627a82c1df4d2686 (diff) | |
| download | rails-2f04c8785540597b02a265324c91267f09ddd07c.tar.gz rails-2f04c8785540597b02a265324c91267f09ddd07c.tar.bz2 rails-2f04c8785540597b02a265324c91267f09ddd07c.zip | |
Merge remote branch 'docrails/master'
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | 9 |
1 files changed, 7 insertions, 2 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 76b65bf219..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,10 +103,15 @@ 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+. + # 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 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. # [<tt>:temporary</tt>] |