Fix server error when user#reset_password called with no token

[rails.git] / db / migrate / 025_add_end_time_to_changesets.rb

diff --git a/db/migrate/025_add_end_time_to_changesets.rb b/db/migrate/025_add_end_time_to_changesets.rb
index b87ce3fdebabcf12abd2d1a192eb36547b9f155b..eaccc008f7666d38713a6e110658a1d6095715da 100644 (file)
--- a/db/migrate/025_add_end_time_to_changesets.rb
+++ b/db/migrate/025_add_end_time_to_changesets.rb
@@ -1,3 +1,5 @@
+require 'migrate'
+

 class AddEndTimeToChangesets < ActiveRecord::Migration
   def self.up
     # swap the boolean closed-or-not for a time when the changeset will
 class AddEndTimeToChangesets < ActiveRecord::Migration
   def self.up
     # swap the boolean closed-or-not for a time when the changeset will


@@ -7,8 +9,8 @@ class AddEndTimeToChangesets < ActiveRecord::Migration
     # it appears that execute will only accept string arguments, so
     # this is an ugly, ugly hack to get some sort of mysql/postgres
     # independence. now i have to go wash my brain with bleach.
     # it appears that execute will only accept string arguments, so
     # this is an ugly, ugly hack to get some sort of mysql/postgres
     # independence. now i have to go wash my brain with bleach.

-    execute("update changesets set closed_at=(now()-'1 hour') where open=(1=0)")
-    execute("update changesets set closed_at=(now()+'1 hour') where open=(1=1)")
+    execute("update changesets set closed_at=(now()-#{interval_constant('1 hour')}) where open=(1=0)")
+    execute("update changesets set closed_at=(now()+#{interval_constant('1 hour')}) where open=(1=1)")

 
     # remove the open column as it is unnecessary now and denormalises 
     # the table.
 
     # remove the open column as it is unnecessary now and denormalises 
     # the table.