diff options
| author | Dave Kroondyk <dave.kroondyk@thomsonreuters.com> | 2012-07-18 10:03:36 -0400 |
|---|---|---|
| committer | Dave Kroondyk <dave.kroondyk@thomsonreuters.com> | 2012-07-18 10:59:32 -0400 |
| commit | ccf7cd05ade081423bf8f000d4b98f8de030683d (patch) | |
| tree | d507df065a87c9664d36e7c2fa99b11694fdaf8f /activerecord/lib/active_record | |
| parent | 35072161b5c116b17bee235b079148b770a27c8b (diff) | |
| download | rails-ccf7cd05ade081423bf8f000d4b98f8de030683d.tar.gz rails-ccf7cd05ade081423bf8f000d4b98f8de030683d.tar.bz2 rails-ccf7cd05ade081423bf8f000d4b98f8de030683d.zip | |
revert Default timestamps to non-null
Commit 3dbedd2 added NOT NULL constraints to timestamps.
Commit fcef728 started to revert this, but was incomplete.
With this commit, 3dbedd2 should be fully reverted and
timestamps will no longer default to NOT NULL.
Diffstat (limited to 'activerecord/lib/active_record')
| -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 |