@@ -23,8 +23,8 @@ module ActiveRecord write_attribute('created_at', t) if respond_to?(:created_at) && created_at.nil? write_attribute('created_on', t) if respond_to?(:created_on) && created_on.nil? - write_attribute('updated_at', t) if respond_to?(:updated_at) - write_attribute('updated_on', t) if respond_to?(:updated_on) + write_attribute('updated_at', t) if respond_to?(:updated_at) && updated_at.nil? + write_attribute('updated_on', t) if respond_to?(:updated_on) && updated_on.nil? end create_without_timestamps end activerecord/lib/active_record/timestamp.rb @@ -16,6 +16,7 @@ require 'models/post' require 'models/comment' require 'models/minimalistic' require 'models/warehouse_thing' +require 'models/parrot' require 'rexml/document' class Category < ActiveRecord::Base; end @@ -2071,6 +2072,15 @@ class BasicsTest < ActiveRecord::TestCase ActiveRecord::Base.logger = original_logger end + def test_create_with_custom_timestamps + custom_datetime = 1.hour.ago.beginning_of_day + + %w(created_at created_on updated_at updated_on).each do |attribute| + parrot = LiveParrot.create(:name => "colombian", attribute => custom_datetime) + assert_equal custom_datetime, parrot[attribute] + end + end + private def with_kcode(kcode) if RUBY_VERSION < '1.9' activerecord/test/cases/base_test.rb 70456aed31ae64b36563fc5d32ac114e0a095231 Luis Hurtado luis@time4code.com http://github.com/rails/rails/commit/63aac338332a06d3c9e28dde7954679703ec7620 63aac338332a06d3c9e28dde7954679703ec7620 2008-12-22T07:19:33-08:00 2008-12-22T07:18:43-08:00 Ensure of Model#create support custom updated_at and updated_on attributes [#1612 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> 29444858c43d6f3a22e9f50ed5e2252ecb6e862a Pratik Naik pratiknaik@gmail.com