Provide database connection settings as a URL.

2 files changed, 33 insertions, 0 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
index bcd3abc08d..d008aabcae 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
@@ -58,6 +58,8 @@ module ActiveRecord
         when Symbol, String
           if configuration = configurations[spec.to_s]
             establish_connection(configuration)
+          elsif spec.is_a?(String) && hash = connection_url_to_hash(spec)
+            establish_connection(hash)
           else
             raise AdapterNotSpecified, "#{spec} database is not configured"
           end
@@ -81,6 +83,26 @@ module ActiveRecord
       end
     end
 
+    def self.connection_url_to_hash(url)
+      config = URI.parse(url)
+      adapter = config.scheme
+      adapter = "postgresql" if adapter == "postgres"
+      spec = { :adapter  => adapter,
+               :username => config.user,
+               :password => config.password,
+               :port     => config.port,
+               :database => config.path.sub(%r{^/},""),
+               :host     => config.host }
+      spec.reject!{ |key,value| value.nil? }
+      if config.query
+        options = Hash[query.split("&").map{ |pair| pair.split("=") }].symbolize_keys
+        spec.merge!(options)
+      end
+      spec
+    rescue URI::InvalidURIError
+      return nil
+    end
+
     class << self
       # Returns the connection currently associated with the class. This can
       # also be used to "borrow" the connection to do database work unrelated
diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb
index 4c65193d75..da57349d93 100644
--- a/activerecord/test/cases/adapter_test.rb
+++ b/activerecord/test/cases/adapter_test.rb
@@ -60,6 +60,17 @@ class AdapterTest < ActiveRecord::TestCase
       assert_equal @connection.show_variable('collation_database'), @connection.collation
     end
 
+    def test_connect_with_url
+      begin
+        ar_config = ARTest.connection_config['arunit']
+        url = "mysql://#{ar_config["username"]}@localhost/#{ar_config["database"]}"
+        ActiveRecord::Base.establish_connection(url)
+        assert_equal ar_config['database'], ActiveRecord::Base.connection.current_database
+      ensure
+        ActiveRecord::Base.establish_connection 'arunit'
+      end
+    end
+
     def test_show_nonexistent_variable_returns_nil
       assert_nil @connection.show_variable('foo_bar_baz')
     end