@@ -85,22 +85,5 @@ 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 a836c3eb7a785a6412161c99239ebbaf33685bb3 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/133111d5ee518c17ba8b78d00fb1961b9f66d036 133111d5ee518c17ba8b78d00fb1961b9f66d036 2009-02-09T17:16:06-08:00 2009-02-09T17:16:06-08:00 [merb_datamapper]Removed a temp monkey patch to fix an issue with DM::Timestamps. Not required anymore since DM fixed this bug. 92f51f5285d240fc0ebcd36d69aa3f24320acbba Matt Aimonetti mattaimonetti@gmail.com