Changeset 8855

Timestamp:

02/10/08 22:46:31 (7 months ago)

Author:

gbuesing

Message:

Multiparameter attributes for time columns fail over to DateTime when out of range of Time

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/base.rb (modified) (1 diff)
• trunk/activerecord/test/cases/base_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Multiparameter attributes for time columns fail over to DateTime when out of range of Time [Geoff Buesing]
-
-* Base#instantiate_time_object uses Time.zone.local() [Geoff Buesing]

trunk/activerecord/lib/active_record/base.rb

@@ -2473 +2473 @@
-      end
-
-      # Includes an ugly hack for Time.local instead of Time.new because the latter is reserved by Time itself.
-      def instantiate_time_object(name, values)
-        if Time.zone && !self.class.skip_time_zone_conversion_for_attributes.include?(name.to_sym)
-          Time.zone.local(*values)
-        else
-(*values) : Time.local
+_time(*values) : Time.local_time
-        end
-      end

trunk/activerecord/test/cases/base_test.rb

@@ -924 +924 @@
-    assert_equal Time.local(2004, 6, 24, 16, 24, 0), topic.written_on
-  end
+  
+  def test_multiparameter_attributes_on_time_with_old_date
+    attributes = {
+      "written_on(1i)" => "1850", "written_on(2i)" => "6", "written_on(3i)" => "24",
+      "written_on(4i)" => "16", "written_on(5i)" => "24", "written_on(6i)" => "00"
+    }
+    topic = Topic.find(1)
+    topic.attributes = attributes
+    # testing against to_s(:db) representation because either a Time or a DateTime might be returned, depending on platform
+    assert_equal "1850-06-24 16:24:00", topic.written_on.to_s(:db)
+  end
-
-  def test_multiparameter_attributes_on_time_with_utc