Skip to content
Browse files

Announce migration versions as they're performed.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6855 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 66bde4c commit d0d5a1fe231dbb4984b70341449f16ac67a2efde @jeremy jeremy committed
Showing with 43 additions and 35 deletions.
  1. +2 −0 activerecord/CHANGELOG
  2. +41 −35 activerecord/lib/active_record/migration.rb
View
2 activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Announce migration versions as they're performed. [Jeremy Kemper]
+
* find gracefully copes with blank :conditions. #7599 [Dan Manges, johnnyb]
* validates_numericality_of takes :greater_than, :greater_than_or_equal_to, :equal_to, :less_than, :less_than_or_equal_to, :odd, and :even options. #3952 [Bob Silva, Dan Kubb, Josh Peek]
View
76 activerecord/lib/active_record/migration.rb
@@ -1,13 +1,13 @@
module ActiveRecord
class IrreversibleMigration < ActiveRecordError#:nodoc:
end
-
+
class DuplicateMigrationVersionError < ActiveRecordError#:nodoc:
def initialize(version)
super("Multiple migrations have the version number #{version}")
end
end
-
+
# Migrations can manage the evolution of a schema used by several physical databases. It's a solution
# to the common problem of adding a field to make a new feature work in your local database, but being unsure of how to
# push that change to other developers and to the production server. With migrations, you can describe the transformations
@@ -207,7 +207,7 @@ def migrate(direction)
when :up then announce "migrating"
when :down then announce "reverting"
end
-
+
result = nil
time = Benchmark.measure { result = send("#{direction}_without_benchmarks") }
@@ -215,7 +215,7 @@ def migrate(direction)
when :up then announce "migrated (%.4fs)" % time.real; write
when :down then announce "reverted (%.4fs)" % time.real; write
end
-
+
result
end
@@ -224,7 +224,7 @@ def migrate(direction)
# it is safe for the call to proceed.
def singleton_method_added(sym) #:nodoc:
return if @ignore_new_methods
-
+
begin
@ignore_new_methods = true
@@ -243,7 +243,7 @@ def write(text="")
end
def announce(message)
- text = "#{name}: #{message}"
+ text = "#{@version} #{name}: #{message}"
length = [0, 75 - text.length].max
write "== %s %s" % [text, "=" * length]
end
@@ -261,16 +261,19 @@ def say_with_time(message)
end
def suppress_messages
- save = verbose
- self.verbose = false
+ save, self.verbose = verbose, false
yield
ensure
self.verbose = save
end
def method_missing(method, *arguments, &block)
- say_with_time "#{method}(#{arguments.map { |a| a.inspect }.join(", ")})" do
- arguments[0] = Migrator.proper_table_name(arguments.first) unless arguments.empty? || method == :execute
+ arg_list = arguments.map(&:inspect) * ', '
+
+ say_with_time "#{method}(#{arg_list})" do
+ unless arguments.empty? || method == :execute
+ arguments[0] = Migrator.proper_table_name(arguments.first)
+ end
ActiveRecord::Base.connection.send(method, *arguments, &block)
end
end
@@ -291,30 +294,29 @@ def migrate(migrations_path, target_version = nil)
return # You're on the right version
end
end
-
+
def up(migrations_path, target_version = nil)
self.new(:up, migrations_path, target_version).migrate
end
-
+
def down(migrations_path, target_version = nil)
self.new(:down, migrations_path, target_version).migrate
end
-
+
def schema_info_table_name
Base.table_name_prefix + "schema_info" + Base.table_name_suffix
end
def current_version
- (Base.connection.select_one("SELECT version FROM #{schema_info_table_name}") || {"version" => 0})["version"].to_i
+ Base.connection.select_value("SELECT version FROM #{schema_info_table_name}").to_i
end
def proper_table_name(name)
# Use the ActiveRecord objects own table_name, or pre/suffix from ActiveRecord::Base if name is a symbol/string
name.table_name rescue "#{ActiveRecord::Base.table_name_prefix}#{name}#{ActiveRecord::Base.table_name_suffix}"
end
-
end
-
+
def initialize(direction, migrations_path, target_version = nil)
raise StandardError.new("This database does not yet support migrations") unless Base.connection.supports_migrations?
@direction, @migrations_path, @target_version = direction, migrations_path, target_version
@@ -326,13 +328,13 @@ def current_version
end
def migrate
- migration_classes.each do |(version, migration_class)|
- Base.logger.info("Reached target version: #{@target_version}") and break if reached_target_version?(version)
- next if irrelevant_migration?(version)
+ migration_classes.each do |migration_class|
+ Base.logger.info("Reached target version: #{@target_version}") and break if reached_target_version?(migration_class.version)
+ next if irrelevant_migration?(migration_class.version)
- Base.logger.info "Migrating to #{migration_class} (#{version})"
+ Base.logger.info "Migrating to #{migration_class} (#{migration_class.version})"
migration_class.migrate(@direction)
- set_schema_version(version)
+ set_schema_version(migration_class.version)
end
end
@@ -342,50 +344,54 @@ def migration_classes
load(migration_file)
version, name = migration_version_and_name(migration_file)
assert_unique_migration_version(migrations, version.to_i)
- migrations << [ version.to_i, migration_class(name) ]
+ migrations << migration_class(name, version.to_i)
end
- down? ? migrations.sort.reverse : migrations.sort
+ sorted = migrations.sort_by { |m| m.version }
+ down? ? sorted.reverse : sorted
end
-
+
def assert_unique_migration_version(migrations, version)
- if !migrations.empty? && migrations.transpose.first.include?(version)
+ if !migrations.empty? && migrations.find { |m| m.version == version }
raise DuplicateMigrationVersionError.new(version)
end
end
-
+
def migration_files
files = Dir["#{@migrations_path}/[0-9]*_*.rb"].sort_by do |f|
migration_version_and_name(f).first.to_i
end
down? ? files.reverse : files
end
-
- def migration_class(migration_name)
- migration_name.camelize.constantize
+
+ def migration_class(migration_name, version)
+ klass = migration_name.camelize.constantize
+ class << klass; attr_accessor :version end
+ klass.version = version
+ klass
end
-
+
def migration_version_and_name(migration_file)
return *migration_file.scan(/([0-9]+)_([_a-z0-9]*).rb/).first
end
-
+
def set_schema_version(version)
Base.connection.update("UPDATE #{self.class.schema_info_table_name} SET version = #{down? ? version.to_i - 1 : version.to_i}")
end
-
+
def up?
@direction == :up
end
-
+
def down?
@direction == :down
end
-
+
def reached_target_version?(version)
return false if @target_version == nil
(up? && version.to_i - 1 >= @target_version) || (down? && version.to_i <= @target_version)
end
-
+
def irrelevant_migration?(version)
(up? && version.to_i <= current_version) || (down? && version.to_i > current_version)
end

0 comments on commit d0d5a1f

Please sign in to comment.
Something went wrong with that request. Please try again.