From 8f3aeb1002d168218071087af98cd5fa96904d63 Mon Sep 17 00:00:00 2001 From: Cuong Tran Date: Tue, 16 Jun 2015 13:42:33 -0700 Subject: [PATCH] Revert "Runs annotate on 'rake db:rollback' too" --- lib/tasks/migrate.rake | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake index 5b334c0ed..2935213bc 100644 --- a/lib/tasks/migrate.rake +++ b/lib/tasks/migrate.rake @@ -2,22 +2,20 @@ # (They are not used to build annotate itself.) # Append annotations to Rake tasks for ActiveRecord, so annotate automatically gets -# run after doing db:migrate. +# run after doing db:migrate. # Unfortunately it relies on ENV for options; it'd be nice to be able to set options # in a per-project config file so this task can read them. namespace :db do - [:migrate, :rollback].each do |cmd| - task cmd do - Annotate::Migration.update_annotations - end + task :migrate do + Annotate::Migration.update_annotations + end - namespace cmd do - [:change, :up, :down, :reset, :redo].each do |t| - task t do - Annotate::Migration.update_annotations - end + namespace :migrate do + [:change, :up, :down, :reset, :redo].each do |t| + task t do + Annotate::Migration.update_annotations end - end + end end end @@ -28,7 +26,7 @@ module Annotate def self.update_annotations unless @@working || (ENV['skip_on_db_migrate'] =~ /(true|t|yes|y|1)$/i) @@working = true - Rake::Task['annotate_models'].invoke + Rake::Task['annotate_models'].invoke end end end