Merge pull request #257 from fred/hotfix/256-active-record-fix

Fix ActiveRecord connect/disconect

Author: jonleighton

lib/spring/application.rb

@@ -252,11 +252,11 @@ def loaded_application_features
     end
 
     def disconnect_database
-      ActiveRecord::Base.remove_connection if defined?(ActiveRecord::Base)
+      ActiveRecord::Base.remove_connection if active_record_configured?
     end
 
     def connect_database
-      ActiveRecord::Base.establish_connection if defined?(ActiveRecord::Base)
+      ActiveRecord::Base.establish_connection if active_record_configured?
     end
 
     # This feels very naughty
@@ -295,5 +295,12 @@ def reset_streams
       [STDOUT, STDERR].each { |stream| stream.reopen(spring_env.log_file) }
       STDIN.reopen("/dev/null")
     end
+
+    private
+
+    def active_record_configured?
+      defined?(ActiveRecord::Base) && ActiveRecord::Base.configurations.present?
+    end
+
   end
 end