From 756d81aba9e2dccbb696d52a858155ffe64a0eb7 Mon Sep 17 00:00:00 2001 From: Patrick Cheng Date: Sun, 19 Feb 2012 21:30:42 -0800 Subject: [PATCH 1/2] if adapter is not there, or different from schema, normailized_uri was generating a wrong uri. should use schema if it's there. --- lib/dm-do-adapter/adapter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dm-do-adapter/adapter.rb b/lib/dm-do-adapter/adapter.rb index e5cd8c3..570d8ea 100644 --- a/lib/dm-do-adapter/adapter.rb +++ b/lib/dm-do-adapter/adapter.rb @@ -229,7 +229,7 @@ def normalized_uri port = @options[:port].nil? ? nil : @options[:port].to_int DataObjects::URI.new( - :scheme => @options[:adapter], + :scheme => @options[:scheme] || @options[:adapter], :user => @options[:user] || @options[:username], :password => @options[:password], :host => @options[:host], From d38bd4576a40a1a73826be69d83b39397b6bda74 Mon Sep 17 00:00:00 2001 From: Patrick Cheng Date: Fri, 24 Feb 2012 15:03:17 -0800 Subject: [PATCH 2/2] centralize to use DataObjects.adapter_name, so handles capitalization appropriately --- lib/dm-do-adapter/adapter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dm-do-adapter/adapter.rb b/lib/dm-do-adapter/adapter.rb index 570d8ea..418a9a4 100644 --- a/lib/dm-do-adapter/adapter.rb +++ b/lib/dm-do-adapter/adapter.rb @@ -266,7 +266,7 @@ def initialize(name, uri_or_options) super # Default the driver-specific logger to DataMapper's logger - if driver_module = DataObjects.const_get(normalized_uri.scheme.capitalize) + if driver_module = DataObjects.adapter_name(normalized_uri) driver_module.logger = DataMapper.logger if driver_module.respond_to?(:logger=) end end