@@ -17,7 +17,7 @@ GEM_EMAIL = "canadaduane@gmail.com" GEM_NAME = "merb_activerecord" PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' -GEM_VERSION = ("1.0.0") + PKG_BUILD +GEM_VERSION = ("1.0.0.1") + PKG_BUILD RELEASE_NAME = "REL #{GEM_VERSION}" merb_activerecord/Rakefile @@ -53,14 +53,21 @@ namespace :db do end def drop_database(config) - case config[:adapter] - when 'mysql' - ActiveRecord::Base.connection.drop_database config[:database] - when /^sqlite/ - FileUtils.rm(File.join(Merb.root, config[:database])) - when 'postgresql' - ActiveRecord::Base.clear_active_connections! - `dropdb "#{config[:database]}"` + begin + ActiveRecord::Base.establish_connection(config) + ActiveRecord::Base.connection + rescue + puts "could not connect to #{config[:database]}, database not dropped" + else + case config[:adapter] + when 'mysql' + ActiveRecord::Base.connection.drop_database config[:database] + when /^sqlite/ + FileUtils.rm(File.join(Merb.root, config[:database])) + when 'postgresql' + ActiveRecord::Base.clear_active_connections! + `dropdb "#{config[:database]}"` + end end end merb_activerecord/lib/active_record/merbtasks.rb @@ -27,10 +27,10 @@ if defined?(Merb::Plugins) def self.run Merb.logger.debug "Disconnecting database connection before forking." - ::ActiveRecord::Base.connection.disconnect! + ::ActiveRecord::Base.clear_active_connections! end - - end + end + generators = File.join(File.dirname(__FILE__), 'generators') Merb.add_generators generators / :migration merb_activerecord/lib/merb_activerecord.rb 30b1c02919a8868b3626c9d3be34c7f66d94e58a Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-plugins/commit/0aaecd306a1561e288d7a9b9a3a974eefcc5eb00 0aaecd306a1561e288d7a9b9a3a974eefcc5eb00 2009-01-26T17:03:51-08:00 2009-01-26T17:03:51-08:00 optimized rake:db:drop and instead of dropping the connections to the db after forking, we are not clearing the connection cached allowing rake tasks to run properly. bdb54a7d27378214f5684b3f8f275ef76f6fbb81 Matt Aimonetti mattaimonetti@gmail.com