|
|
@ -149,29 +149,17 @@ class User < Sequel::Model
|
|
|
|
configuration = if options[:as]
|
|
|
|
configuration = if options[:as]
|
|
|
|
if options[:as] == :superuser
|
|
|
|
if options[:as] == :superuser
|
|
|
|
::Rails::Sequel.configuration.environment_for(Rails.env).merge(
|
|
|
|
::Rails::Sequel.configuration.environment_for(Rails.env).merge(
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
'database' => self.database_name, :logger => ::Rails.logger
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
elsif options[:as] == :public_user
|
|
|
|
|
|
|
|
::Rails::Sequel.configuration.environment_for(Rails.env).merge(
|
|
|
|
|
|
|
|
'database' => self.database_name, :logger => ::Rails.logger,
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
'database' => self.database_name, :logger => logger
|
|
|
|
'database' => self.database_name, :logger => logger
|
|
|
|
)
|
|
|
|
)
|
|
|
|
elsif options[:as] == :public_user
|
|
|
|
elsif options[:as] == :public_user
|
|
|
|
::Rails::Sequel.configuration.environment_for(Rails.env).merge(
|
|
|
|
::Rails::Sequel.configuration.environment_for(Rails.env).merge(
|
|
|
|
'database' => self.database_name, :logger => logger,
|
|
|
|
'database' => self.database_name, :logger => logger,
|
|
|
|
>>>>>>> release/staging
|
|
|
|
|
|
|
|
'username' => CartoDB::PUBLIC_DB_USER, 'password' => ''
|
|
|
|
'username' => CartoDB::PUBLIC_DB_USER, 'password' => ''
|
|
|
|
)
|
|
|
|
)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
else
|
|
|
|
else
|
|
|
|
::Rails::Sequel.configuration.environment_for(Rails.env).merge(
|
|
|
|
::Rails::Sequel.configuration.environment_for(Rails.env).merge(
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
'database' => self.database_name, :logger => ::Rails.logger,
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
'database' => self.database_name, :logger => logger,
|
|
|
|
'database' => self.database_name, :logger => logger,
|
|
|
|
>>>>>>> release/staging
|
|
|
|
|
|
|
|
'username' => database_username, 'password' => database_password
|
|
|
|
'username' => database_username, 'password' => database_password
|
|
|
|
)
|
|
|
|
)
|
|
|
|
end
|
|
|
|
end
|
|
|
|