aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2006-10-22 02:55:21 +0000
committerMarcel Molina <marcel@vernix.org>2006-10-22 02:55:21 +0000
commitfb7807e24408912fcaa2842948eee473d6af1a70 (patch)
tree0923e2e5227e27226269ee92ac8c390d699faff4
parentda18193d5ff0647bf7e459eee21ee5762de83d1b (diff)
downloadrails-fb7807e24408912fcaa2842948eee473d6af1a70.tar.gz
rails-fb7807e24408912fcaa2842948eee473d6af1a70.tar.bz2
rails-fb7807e24408912fcaa2842948eee473d6af1a70.zip
Document other options available to migration's add_column. #6419
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5333 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--activerecord/CHANGELOG2
-rw-r--r--activerecord/lib/active_record/migration.rb3
2 files changed, 4 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 10ea2ec7f2..3f7bf9e808 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Document other options available to migration's add_column. #6419 [grg]
+
* MySQL: all_hashes compatibility with old MysqlRes class. #6429 [Jeremy Kemper]
* Fix has_many :through to add the appropriate conditions when going through an association using STI. Closes #5783. [Jonathan Viney]
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index 5402cf2446..b132b3d820 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -66,7 +66,8 @@ module ActiveRecord
# named +column_name+ specified to be one of the following types:
# :string, :text, :integer, :float, :decimal, :datetime, :timestamp, :time,
# :date, :binary, :boolean. A default value can be specified by passing an
- # +options+ hash like { :default => 11 }.
+ # +options+ hash like { :default => 11 }. Other options include :limit and :null (e.g. { :limit => 50, :null => false })
+ # -- see ActiveRecord::ConnectionAdapters::TableDefinition#column for details.
# * <tt>rename_column(table_name, column_name, new_column_name)</tt>: Renames a column but keeps the type and content.
# * <tt>change_column(table_name, column_name, type, options)</tt>: Changes the column to a different type using the same
# parameters as add_column.