aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/migration.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-12-01 17:08:01 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2010-12-01 17:08:01 -0800
commit3ec212e3c9c815e9993cbea409c60774ea75cd30 (patch)
tree56f77db136192f65eb4e3a1417d8b989e56cfe37 /activerecord/lib/active_record/migration.rb
parentc15c14563e6604aab232336b16e14f1f235cc19d (diff)
downloadrails-3ec212e3c9c815e9993cbea409c60774ea75cd30.tar.gz
rails-3ec212e3c9c815e9993cbea409c60774ea75cd30.tar.bz2
rails-3ec212e3c9c815e9993cbea409c60774ea75cd30.zip
rolling out migrated_at until I can fix the build
Diffstat (limited to 'activerecord/lib/active_record/migration.rb')
-rw-r--r--activerecord/lib/active_record/migration.rb18
1 files changed, 7 insertions, 11 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index d2ebf656cb..f6321f1499 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -628,7 +628,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
@@ -664,7 +664,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 " : ""
@@ -690,20 +690,16 @@ module ActiveRecord
end
private
- def record_version_state_after_migrating(target)
+ def record_version_state_after_migrating(version)
table = Arel::Table.new(self.class.schema_migrations_table_name)
@migrated_versions ||= []
if down?
- @migrated_versions.delete(target.version)
- table.where(table["version"].eq(target.version.to_s)).delete
+ @migrated_versions.delete(version)
+ table.where(table["version"].eq(version.to_s)).delete
else
- @migrated_versions.push(target.version).sort!
- table.insert(
- table["version"] => target.version.to_s,
- table["name"] => File.basename(target.filename,'.rb').gsub(/^\d+_/,''),
- table["migrated_at"] => Time.now
- )
+ @migrated_versions.push(version).sort!
+ table.insert table["version"] => version.to_s
end
end