aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/migration.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-12-09 15:52:28 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-12-09 15:57:34 -0700
commitcff747d304f008c103a7ba92440400a9a0848bee (patch)
tree88e4ac162d9a90db715abecbbfbfe155c7756d6f /activerecord/lib/active_record/migration.rb
parent3c2c1a46064684a1becc8ae7b6b7fe6eebf9651a (diff)
downloadrails-cff747d304f008c103a7ba92440400a9a0848bee.tar.gz
rails-cff747d304f008c103a7ba92440400a9a0848bee.tar.bz2
rails-cff747d304f008c103a7ba92440400a9a0848bee.zip
Move to the schema-migrations-metadata branch.
Pending work on graceful app upgrades. Revert "Merge pull request #8439 from joshsusser/fixes" This reverts commit ce8ac39338f86388e70356b3a470b3ea443802ae, reversing changes made to b0e7b6f67c984d4b1502e801781ed75fad681633. Revert "Merge pull request #8431 from joshsusser/schemadump" This reverts commit 036d3e1c2b65c4b8cbd23de2e20ad67b9b756182, reversing changes made to 0c692f4d121792117b6a71e5ed590a31c3b9d12e. Revert "Merge branch 'joshsusser-master' into merge" This reverts commit 0c692f4d121792117b6a71e5ed590a31c3b9d12e, reversing changes made to 2e299fca715b083a60222a85e48f9d3b8dd8ce93. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/schema_dumper_test.rb
Diffstat (limited to 'activerecord/lib/active_record/migration.rb')
-rw-r--r--activerecord/lib/active_record/migration.rb24
1 files changed, 7 insertions, 17 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index 4ce276d4bf..22347fcaef 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -1,6 +1,5 @@
require "active_support/core_ext/class/attribute_accessors"
require 'set'
-require 'digest/md5'
module ActiveRecord
# Exception that can be raised to stop migrations from going backwards.
@@ -555,10 +554,6 @@ module ActiveRecord
delegate :migrate, :announce, :write, :to => :migration
- def fingerprint
- @fingerprint ||= Digest::MD5.hexdigest(File.read(filename))
- end
-
private
def migration
@@ -729,7 +724,7 @@ module ActiveRecord
raise UnknownMigrationVersionError.new(@target_version) if target.nil?
unless (up? && migrated.include?(target.version.to_i)) || (down? && !migrated.include?(target.version.to_i))
target.migrate(@direction)
- record_version_state_after_migrating(target)
+ record_version_state_after_migrating(target.version)
end
end
@@ -752,7 +747,7 @@ module ActiveRecord
begin
ddl_transaction do
migration.migrate(@direction)
- record_version_state_after_migrating(migration)
+ record_version_state_after_migrating(migration.version)
end
rescue => e
canceled_msg = Base.connection.supports_ddl_transactions? ? "this and " : ""
@@ -810,18 +805,13 @@ module ActiveRecord
raise DuplicateMigrationVersionError.new(version) if version
end
- def record_version_state_after_migrating(target)
+ def record_version_state_after_migrating(version)
if down?
- migrated.delete(target.version)
- ActiveRecord::SchemaMigration.where(:version => target.version.to_s).delete_all
+ migrated.delete(version)
+ ActiveRecord::SchemaMigration.where(:version => version.to_s).delete_all
else
- migrated << target.version
- ActiveRecord::SchemaMigration.create!(
- :version => target.version.to_s,
- :migrated_at => Time.now,
- :fingerprint => target.fingerprint,
- :name => File.basename(target.filename,'.rb').gsub(/^\d+_/,'')
- )
+ migrated << version
+ ActiveRecord::SchemaMigration.create!(:version => version.to_s)
end
end