xmlblog (owner)

Revisions

gist: 152292 Download_button fork
public
Public Clone URL: git://gist.github.com/152292.git
Embed All Files: show embed
connection_specification.rb #
raw 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26

diff --git a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
index bbc290f..ddd0089 100644
--- a/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
+++ b/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
@@ -52,12 +52,18 @@ module ActiveRecord
       case spec
         when nil
           raise AdapterNotSpecified unless defined? RAILS_ENV
-          establish_connection(RAILS_ENV)
+          if configuration = configurations[RAILS_ENV]['default']
+            establish_connection(configuration)
+          else
+            establish_connection(RAILS_ENV)
+          end  
         when ConnectionSpecification
           @@connection_handler.establish_connection(name, spec)
-        when Symbol, String
+        when Symbol, String          
           if configuration = configurations[spec.to_s]
             establish_connection(configuration)
+          elsif configuration = configurations[RAILS_ENV][spec.to_s]
+            establish_connection(configuration)  
           else
             raise AdapterNotSpecified, "#{spec} database is not configured"
           end