foreigner_rail3_beta4.diff

diff --git a/lib/foreigner.rb b/lib/foreigner.rb
index 540657a..2eb55aa 100644
--- a/lib/foreigner.rb
+++ b/lib/foreigner.rb
@@ -19,6 +19,14 @@ module Foreigner
     end
     
     def configured_adapter
+      if  !ActiveRecord::Base.connected?
+        if Rails.application
+          ActiveRecord::Base.configurations = Rails.application.config.database_configuration
+          ActiveRecord::Base.establish_connection
+          ActiveRecord::Base.connection.adapter_name.downcase
+        end
+      else
+        ActiveRecord::Base.connection.adapter_name.downcase
+      end
-      ActiveRecord::Base.connection.adapter_name.downcase
     end
     
@@ -26,8 +34,10 @@ module Foreigner
       if defined?(Rails) && Rails.version >= '3.0'
         ActiveSupport.on_load :active_record do
           unless ActiveRecord::Base.connected?
-            ActiveRecord::Base.configurations = Rails.application.config.database_configuration
-            ActiveRecord::Base.establish_connection
+            if Rails.application
+              ActiveRecord::Base.configurations = Rails.application.config.database_configuration
+              ActiveRecord::Base.establish_connection
+            end
           end
           block.call
         end