diff options
author | Rizwan Reza <rizwanreza@gmail.com> | 2010-03-27 12:57:41 +0430 |
---|---|---|
committer | wycats <wycats@gmail.com> | 2010-03-27 01:33:42 -0700 |
commit | 41e5c7ed44fedb95636ef9b7a792c46ea03309bd (patch) | |
tree | 596ba598a895aa10b91890e842d0a4cee4bf653c /activerecord/lib/active_record/connection_adapters/abstract | |
parent | 68ade93cde3fcb3ac9fdfe0541d33d22c2c748d7 (diff) | |
download | rails-41e5c7ed44fedb95636ef9b7a792c46ea03309bd.tar.gz rails-41e5c7ed44fedb95636ef9b7a792c46ea03309bd.tar.bz2 rails-41e5c7ed44fedb95636ef9b7a792c46ea03309bd.zip |
primary_key now supports :limit. [#876 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb index 64faaef4a0..5e29baf51f 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -274,7 +274,7 @@ module ActiveRecord column_options = {} column_options[:null] = null unless null.nil? column_options[:default] = default unless default.nil? - add_column_options!(column_sql, column_options) unless type.to_sym == :primary_key + add_column_options!(column_sql, column_options) column_sql end @@ -334,8 +334,8 @@ module ActiveRecord # Appends a primary key definition to the table definition. # Can be called multiple times, but this is probably not a good idea. - def primary_key(name) - column(name, :primary_key) + def primary_key(name, options = {}) + column(name, :primary_key, options) end # Returns a ColumnDefinition for the column with name +name+. @@ -357,7 +357,7 @@ module ActiveRecord # # Available options are (none of these exists by default): # * <tt>:limit</tt> - - # Requests a maximum column length. This is number of characters for <tt>:string</tt> and <tt>:text</tt> columns and number of bytes for :binary and :integer columns. + # Requests a maximum column length. This is number of characters for <tt>:string</tt> and <tt>:text</tt> columns and number of bytes for :binary, :integer and :primary_key columns. # * <tt>:default</tt> - # The column's default value. Use nil for NULL. # * <tt>:null</tt> - |