merb_activerecord 1.0.0 → 1.0.0.1

data/Rakefile

@@ -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}"
 

data/lib/active_record/merbtasks.rb

@@ -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
   

data/lib/merb_activerecord.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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_activerecord
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.0.1
 platform: ruby
 authors: 
 - Duane Johnson