Browse Source

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

tags/v3.0.1
moshenglv 5 years ago
parent
commit
ab4af170fb
2 changed files with 3 additions and 1 deletions
  1. +1
    -0
      app/controllers/ci/base_controller.rb
  2. +2
    -1
      app/controllers/concerns/ci/db_connectable.rb

+ 1
- 0
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
connect_to_trustie_ci_database(options)
else
options = options.merge(db_name: current.login)
connect_to_ci_database(options)
end



+ 2
- 1
app/controllers/concerns/ci/db_connectable.rb View File

@@ -17,7 +17,8 @@ module Ci::DbConnectable
password: db_config[:password],
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)
@connection = Ci::Database.set_connection(db_params).connection


Loading…
Cancel
Save