@@ -23,7 +23,11 @@ module Desert #:nodoc: ActiveRecord::Base.connection.update("UPDATE #{self.class.schema_info_table_name} SET version = #{version} WHERE plugin_name = '#{current_plugin.name}'") end end - alias_method :record_version_state_after_migrating, :set_schema_version + + def migrated + current_plugin_version = self.class.current_version + (1..current_plugin_version).to_a + end end end end lib/desert/plugin_migrations/1.2/migrator.rb @@ -3,7 +3,7 @@ module Desert #:nodoc: class Migrator < ActiveRecord::Migrator class << self def current_version #:nodoc: - result = ActiveRecord::Base.connection.select_one("SELECT version FROM #{schema_migrations_table_name} WHERE plugin_name = '#{current_plugin.name}'") + result = ActiveRecord::Base.connection.select_one("SELECT version FROM #{schema_migrations_table_name} WHERE plugin_name = '#{current_plugin.name}' order by version desc") if result result['version'].to_i else @@ -11,19 +11,25 @@ module Desert #:nodoc: 0 end end + + def get_all_versions + ActiveRecord::Base.connection.select_values("SELECT version FROM #{schema_migrations_table_name} where plugin_name='#{current_plugin.name}'").map(&:to_i).sort + end end - def set_schema_version(version) - version = down? ? version.to_i - 1 : version.to_i + def record_version_state_after_migrating(version) + sm_table = self.class.schema_migrations_table_name - if ActiveRecord::Base.connection.select_one("SELECT version FROM #{self.class.schema_migrations_table_name} WHERE plugin_name = '#{current_plugin.name}'").nil? - # We need to create the entry since it doesn't exist - ActiveRecord::Base.connection.execute("INSERT INTO #{self.class.schema_migrations_table_name} (version, plugin_name) VALUES (#{version},'#{current_plugin.name}')") + if down? + ActiveRecord::Base.connection.update("DELETE FROM #{sm_table} WHERE version = '#{version}' WHERE plugin_name = '#{current_plugin.name}'") else - ActiveRecord::Base.connection.update("UPDATE #{self.class.schema_migrations_table_name} SET version = #{version} WHERE plugin_name = '#{current_plugin.name}'") + ActiveRecord::Base.connection.insert("INSERT INTO #{sm_table} (plugin_name, version) VALUES ('#{current_plugin.name}', '#{version}')") end end - alias_method :record_version_state_after_migrating, :set_schema_version + + def migrated + self.class.get_all_versions + end end end end lib/desert/plugin_migrations/2.1/migrator.rb @@ -24,11 +24,6 @@ module Desert #:nodoc: ActiveRecord::Base.table_name_prefix + 'plugin_schema_migrations' + ActiveRecord::Base.table_name_suffix end end - - def migrated - current_plugin_version = self.class.current_version - (1..current_plugin_version).to_a - end end end end \ No newline at end of file lib/desert/plugin_migrations/migrator.rb @@ -19,6 +19,10 @@ module ActiveRecord results.should == [ { 'plugin_name' => 'acts_as_spiffy', + 'version' => '1' + }, + { + 'plugin_name' => 'acts_as_spiffy', 'version' => '2' }, ] spec/rails_root/spec/desert/migration_integration_spec.rb cf87e5d8e3e9a40a369893c1835dc01bcf068ddb Brian Takita btakita@btakita-laptop.(none) http://github.com/tog/desert/commit/32c5991ef58b2d5dfabbb8238268637f17315c7a 32c5991ef58b2d5dfabbb8238268637f17315c7a 2009-04-22T03:12:22-07:00 2008-12-27T03:14:11-08:00 Migrater#migrated is not properly implemented for plugin_schema_migrations for Rails >= 2.1.0 Signed-off-by: Aitor García Rey <aitor@linkingpaths.com> da7ffd9262814dc48c97c83025e99ee5866d501a Aitor García Rey aitor@linkingpaths.com