diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-10-16 16:14:56 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-10-16 16:14:56 -0700 |
| commit | 8919a68b961e2789286a1f9e71fd1b8a9ee7d3e0 (patch) | |
| tree | b76bb38481900fbdc4973cdfa0affdebfe823642 /activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | |
| parent | f10d62c4bf0be035eafd3f38a9e50550e8060b21 (diff) | |
| parent | 3dbedd2823ff6c8a1f2f078ae9df9c6ceb275e1b (diff) | |
| download | rails-8919a68b961e2789286a1f9e71fd1b8a9ee7d3e0.tar.gz rails-8919a68b961e2789286a1f9e71fd1b8a9ee7d3e0.tar.bz2 rails-8919a68b961e2789286a1f9e71fd1b8a9ee7d3e0.zip | |
Merge pull request #3334 from mperham/master
Default timestamps to non-null
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb')
| -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 82f564e41d..989a4fcbca 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -252,7 +252,7 @@ module ActiveRecord # Appends <tt>:datetime</tt> columns <tt>:created_at</tt> and # <tt>:updated_at</tt> to the table. def timestamps(*args) - options = args.extract_options! + options = { :null => false }.merge(args.extract_options!) column(:created_at, :datetime, options) column(:updated_at, :datetime, options) end |