diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-07-18 09:39:23 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-07-18 09:39:23 -0700 |
| commit | fe5b943d9fd389f313dd87bf73b7c11b8746227b (patch) | |
| tree | d507df065a87c9664d36e7c2fa99b11694fdaf8f /activerecord/lib | |
| parent | 35072161b5c116b17bee235b079148b770a27c8b (diff) | |
| parent | ccf7cd05ade081423bf8f000d4b98f8de030683d (diff) | |
| download | rails-fe5b943d9fd389f313dd87bf73b7c11b8746227b.tar.gz rails-fe5b943d9fd389f313dd87bf73b7c11b8746227b.tar.bz2 rails-fe5b943d9fd389f313dd87bf73b7c11b8746227b.zip | |
Merge pull request #7095 from davekaro/master
revert Default timestamps to non-null
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | 2 |
1 files changed, 1 insertions, 1 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 ef17dfbbc5..f9ae1ed475 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -271,7 +271,7 @@ module ActiveRecord # Appends <tt>:datetime</tt> columns <tt>:created_at</tt> and # <tt>:updated_at</tt> to the table. def timestamps(*args) - options = { :null => false }.merge(args.extract_options!) + options = args.extract_options! column(:created_at, :datetime, options) column(:updated_at, :datetime, options) end |