From e1b1eeba5a0cf29d5ccc1f463a9c695b88770d3c Mon Sep 17 00:00:00 2001 From: Harish Shetty Date: Fri, 1 May 2015 15:24:40 -0700 Subject: [PATCH] Aligned the establish connection paramater handling to be similar to latest version of rails --- .../abstract/connection_specification_changes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/composite_primary_keys/connection_adapters/abstract/connection_specification_changes.rb b/lib/composite_primary_keys/connection_adapters/abstract/connection_specification_changes.rb index 1ab091d6..23130049 100644 --- a/lib/composite_primary_keys/connection_adapters/abstract/connection_specification_changes.rb +++ b/lib/composite_primary_keys/connection_adapters/abstract/connection_specification_changes.rb @@ -9,7 +9,7 @@ def self.load_cpk_adapter(adapter) end end - def self.establish_connection(spec = ENV["DATABASE_URL"]) + def self.establish_connection(spec = nil) spec ||= ActiveRecord::ConnectionHandling::DEFAULT_ENV.call.to_sym resolver = ConnectionAdapters::ConnectionSpecification::Resolver.new configurations spec = resolver.spec(spec)