Commit d878a5b7 by Cuong Tran

Merge pull request #259 from ctran/revert-249-run-on-rollback

Revert "Runs annotate on 'rake db:rollback' too"
parents 1ee47e53 8f3aeb10
...@@ -2,22 +2,20 @@ ...@@ -2,22 +2,20 @@
# (They are not used to build annotate itself.) # (They are not used to build annotate itself.)
# Append annotations to Rake tasks for ActiveRecord, so annotate automatically gets # 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 # 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. # in a per-project config file so this task can read them.
namespace :db do namespace :db do
[:migrate, :rollback].each do |cmd| task :migrate do
task cmd do Annotate::Migration.update_annotations
Annotate::Migration.update_annotations end
end
namespace cmd do namespace :migrate do
[:change, :up, :down, :reset, :redo].each do |t| [:change, :up, :down, :reset, :redo].each do |t|
task t do task t do
Annotate::Migration.update_annotations Annotate::Migration.update_annotations
end
end end
end end
end end
end end
...@@ -28,7 +26,7 @@ module Annotate ...@@ -28,7 +26,7 @@ module Annotate
def self.update_annotations def self.update_annotations
unless @@working || (ENV['skip_on_db_migrate'] =~ /(true|t|yes|y|1)$/i) unless @@working || (ENV['skip_on_db_migrate'] =~ /(true|t|yes|y|1)$/i)
@@working = true @@working = true
Rake::Task['annotate_models'].invoke Rake::Task['annotate_models'].invoke
end end
end end
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment