aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
diff options
context:
space:
mode:
authorMike Perham <mperham@gmail.com>2011-10-14 21:09:53 -0700
committerMike Perham <mperham@gmail.com>2011-10-14 21:09:53 -0700
commit3dbedd2823ff6c8a1f2f078ae9df9c6ceb275e1b (patch)
treea0580734399025a32c6be877c2f96d8955dbb1a2 /activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
parente759c8882a990606bb4aee8a643431ebe544c69f (diff)
downloadrails-3dbedd2823ff6c8a1f2f078ae9df9c6ceb275e1b.tar.gz
rails-3dbedd2823ff6c8a1f2f078ae9df9c6ceb275e1b.tar.bz2
rails-3dbedd2823ff6c8a1f2f078ae9df9c6ceb275e1b.zip
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.rb2
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