Merge git://github.com/tyler/db-charmer

alvinschur · Apr 9, 2010 · b124b20 · b124b20
2 parents 62c2889 + fb08db1
commit b124b20
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/db_charmer.rb b/lib/db_charmer.rb
@@ -2,6 +2,9 @@ module DbCharmer
   @@connections_should_exist = true
   mattr_accessor :connections_should_exist
 
+  @@env = defined?(RAILS_ENV) ? RAILS_ENV : 'development'
+  mattr_accessor :env
+
   def self.connections_should_exist?
     !! connections_should_exist
   end

diff --git a/lib/db_charmer/active_record_extensions.rb b/lib/db_charmer/active_record_extensions.rb
@@ -4,10 +4,10 @@ module ClassMethods
 
       def establish_real_connection_if_exists(name, should_exist = false)
         name = name.to_s
-        config = configurations[RAILS_ENV][name]
+        config = configurations[DbCharmer.env][name]
         unless config
           if should_exist
-            raise ArgumentError, "Invalid connection name (does not exist in database.yml): #{RAILS_ENV}/#{name}"
+            raise ArgumentError, "Invalid connection name (does not exist in database.yml): #{DbCharmer.env}/#{name}"
           end
           return # No need to establish connection - they do not want us to
         end