From 10e568577536460647f97dbcc5b9d1777937f5e8 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Thu, 28 Jun 2012 11:56:47 -0700 Subject: Merge pull request #6900 from cbandy/issue-6898 Require URI in ConnectionSpecification Conflicts: activerecord/lib/active_record/connection_adapters/connection_specification.rb --- .../connection_adapters/abstract/connection_specification.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'activerecord/lib') 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 7145dc0692..6c8a102caf 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb @@ -1,3 +1,5 @@ +require 'uri' + module ActiveRecord class Base class ConnectionSpecification #:nodoc: -- cgit v1.2.3