@@ -4,7 +4,6 @@ module Radiant def self.included(base) base.class_eval %{ alias_method_chain :existing_migrations, :extensions - alias_method_chain :current_migration_number, :extensions } end @@ -12,12 +11,6 @@ module Radiant Dir.glob("#{destination_path(@migration_directory)}/[0-9]*_*.rb").grep(/[0-9]+_#{file_name}.rb$/) end - def current_migration_number_with_extensions - Dir.glob("#{destination_path(@migration_directory)}/[0-9]*.rb").inject(0) do |max, file_path| - n = File.basename(file_path).split('_', 2).first.to_i - if n > max then n else max end - end - end end end Rails::Generator::Commands::Base.class_eval { include Radiant::GeneratorBaseExtension } \ No newline at end of file lib/generators/generator_base_extension.rb @@ -29,7 +29,6 @@ module Radiant return # You're on the right version end end - migrate_without_extension_support end alias_method_chain :migrate, :extension_support @@ -37,8 +36,12 @@ module Radiant def current_version @extension.meta.schema_version end + + def migrated + @extension.meta.schema_version.to_i > 0 ? (1..@extension.meta.schema_version) : [] + end - def set_schema_version(version) + def record_version_state_after_migrating(version) @extension.meta.update_attributes(:schema_version => (down? ? version.to_i - 1 : version.to_i)) end lib/radiant/extension_migrator.rb @@ -1,4 +1,4 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../config/boot' -require 'generators/generator_base_extension' -require 'commands/generate' \ No newline at end of file +require 'commands/generate' +require 'generators/generator_base_extension' \ No newline at end of file script/generate 4c5acc6d81cd118c6205d9f26af4d550224f785c Josh French josh@vitamin-j.com http://github.com/saturnflyer/radiant/commit/2572b4da59ee42d21e926b429c7784cbd0c5a721 2572b4da59ee42d21e926b429c7784cbd0c5a721 2008-08-18T20:59:47-07:00 2008-08-18T20:00:02-07:00 Workaround for new 2.1-style migrations Don't alias removed method; correct load order to work with new Rails initializer; set version on extension meta and make ExtensionMigrator behave like pre- Rails 2.1 migrations. 64f69aa558c2eb4ea11d2de70f657ad476a55b51 Josh French josh@vitamin-j.com