remove unneeded setup for ar

pull/14348/head
Gonzalo Riestra 6 years ago
parent 61dc702fdb
commit 31c819b178

@ -172,8 +172,6 @@ module Carto
options[:username] = @user.database_username
options[:password] = @user.database_password
options[:user_schema] = @user.database_schema
db_config = Rails.configuration.database_configuration[Rails.env]
options[:connect_timeout] = db_config['connect_timeout']
Carto::Db::Connection.connect(@user.database_host, @user.database_name, options) do |_, connection|
if block_given?
yield(connection)

@ -89,7 +89,7 @@ module Carto
database: db_name,
port: base_config['port'],
encoding: base_config['encoding'].nil? ? 'unicode' : base_config['encoding'],
connect_timeout: options[:connect_timeout]
connect_timeout: base_config['connect_timeout']
}
case options[:as]

@ -22,8 +22,7 @@ describe Carto::UserService do
default_opts = {
username: carto_user.database_username,
password: carto_user.database_password,
user_schema: carto_user.database_schema,
connect_timeout: -1
user_schema: carto_user.database_schema
}
expected_params = [carto_user.database_host, carto_user.database_name, default_opts]

Loading…
Cancel
Save