@@ -68,4 +68,22 @@ if defined?(Merb::Plugins) Merb.add_generators generators / 'data_mapper_model' Merb.add_generators generators / 'data_mapper_resource_controller' Merb.add_generators generators / 'data_mapper_migration' + + # Override bug in DM::Timestamps + Merb::BootLoader.after_app_loads do + module DataMapper + module Timestamp + private + + def set_timestamps + return unless dirty? || new_record? + TIMESTAMP_PROPERTIES.each do |name,(_type,proc)| + if model.properties.has_property?(name) + model.properties[name].set(self, proc.call(self, model.properties[name])) unless attribute_dirty?(name) + end + end + end + end + end + end end merb_datamapper/lib/merb_datamapper.rb 9e045216f88e126806ba3d94fd570cacab07a2d8 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/56ab0f1a9d3c6fec10a67fe3c57399e7f4b5a6dc 56ab0f1a9d3c6fec10a67fe3c57399e7f4b5a6dc 2009-01-18T23:53:42-08:00 2009-01-18T23:53:42-08:00 merb_datamapper should hack around a bug in set_timestamps 350dceb4d9c08ff516d2b58543c1169c3f799bf8 Yehuda Katz wycats@gmail.com