diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-10 21:08:40 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-10 21:08:40 +0000 |
| commit | 35f7cc23badaf51eca7d27b72613ab220d6936a6 (patch) | |
| tree | 08b96c997afe4f7cff6979b6cfce1ec77540b7f4 | |
| parent | ac681152051884c173486006089fc459cbf7128e (diff) | |
| download | rails-35f7cc23badaf51eca7d27b72613ab220d6936a6.tar.gz rails-35f7cc23badaf51eca7d27b72613ab220d6936a6.tar.bz2 rails-35f7cc23badaf51eca7d27b72613ab220d6936a6.zip | |
create_table rdoc: suggest :id => false for habtm join tables
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4606 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 19e9777c50..d34cf3d2d6 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* create_table rdoc: suggest :id => false for habtm join tables. [Zed Shaw] + * PostgreSQL: return array fields as strings. #4664 [Robby Russell] * SQLServer: added tests to ensure all database statements are closed, refactored identity_insert management code to use blocks, removed update/delete rowcount code out of execute and into update/delete, changed insert to go through execute method, removed unused quoting methods, disabled pessimistic locking tests as feature is currently unsupported, fixed RakeFile to load sqlserver specific tests whether running in ado or odbc mode, fixed support for recently added decimal types, added support for limits on integer types. #5670 [Tom Ward] 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 542d3d131d..cd13e264a1 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -44,8 +44,8 @@ module ActiveRecord # # The +options+ hash can include the following keys: # [<tt>:id</tt>] - # Set to true or false to add/not add a primary key column - # automatically. Defaults to true. + # Whether to automatically add a primary key column. Defaults to true. + # Join tables for has_and_belongs_to_many should set :id => false. # [<tt>:primary_key</tt>] # The name of the primary key, if one is to be added automatically. # Defaults to +id+. |