0
@@ -79,7 +79,6 @@ module DataMapper
0
         super
0
         @resource_naming_convention = proc {|value| value.split("::").last}
0
         @field_naming_convention = proc {|value| Extlib::Inflection.camelize(value)}
0
-        connect!
0
       end
0
       
0
       def connect!
0
@@ -105,11 +104,11 @@ module DataMapper
0
         end
0
         
0
         require "salesforce_api"
0
-        @connection = SalesforceAPI::Connection.new(URI.unescape(@uri.user), @uri.password, "#{ENV["HOME"]}/.salesforce/#{basename}").driver
0
+        SalesforceAPI::Connection.new(URI.unescape(@uri.user), @uri.password, "#{ENV["HOME"]}/.salesforce/#{basename}").driver
0
       end
0
       
0
       def connection
0
-        @connection || connect!
0
+        @connection ||= connect!
0
       end
0
 
0
       def read_many(query)