Gitlink
/
forgeplus
33
1
Fork 58
Code Issues 1 Pull Requests 1 Packages Releases 15 Wiki Activity

连接ci数据库名修改，根据repo

This commit is contained in:
moshenglv 2021-01-20 13:52:30 +08:00
parent ab3242569d
commit ab4af170fb
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/ci/base_controller.rb
View File

@ -63,6 +63,7 @@ class Ci::BaseController < ApplicationController
if current.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE if current.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE
connect_to_trustie_ci_database(options) connect_to_trustie_ci_database(options)
else else
options = options.merge(db_name: current.login)
connect_to_ci_database(options) connect_to_ci_database(options)
end end

3
app/controllers/concerns/ci/db_connectable.rb
View File

@ -17,7 +17,8 @@ module Ci::DbConnectable
password: db_config[:password], password: db_config[:password],
port: db_config[:port] port: db_config[:port]
} }
req_params = req_params.merge(database: "#{current_user.login}_#{db_config[:database]}") unless master_db === true db_name = options[:db_name].blank? ? current_user.login : options[:db_name]
req_params = req_params.merge(database: "#{db_name}_#{db_config[:database]}") unless master_db === true
db_params = Ci::Database.get_connection_params(req_params) db_params = Ci::Database.get_connection_params(req_params)
@connection = Ci::Database.set_connection(db_params).connection @connection = Ci::Database.set_connection(db_params).connection