FIX perfect ci init datbase

app/controllers/concerns/ci/db_connectable.rb

@@ -5,7 +5,8 @@ module Ci::DbConnectable
   end
 
   # Dynamically sets the database connection.
-  def connect_to_ci_database(master_db=false)
+  def connect_to_ci_database(options={})
+    master_db = options[:master_db] || false
     config = Rails.application.config_for(:configuration).symbolize_keys!
     db_config = config[:ci_db_server].symbolize_keys!
     raise 'ci database config missing' if db_config.blank?
@@ -14,22 +15,24 @@ module Ci::DbConnectable
       host: db_config[:host],
       username: db_config[:username],
       password: db_config[:password],
-      port: db_config[:port],
-      database: master_db === true ? db_config[:database] : "#{current_user.login}_#{db_config[:database]}"
+      port: db_config[:port]
     }
+    req_params = req_params.merge(database: "#{current_user.login}_#{db_config[:database]}") unless master_db === true
+
     db_params = Ci::Database.get_connection_params(req_params)
-    @connection = Ci::Database.set_connection(db_params)
+    @connection = Ci::Database.set_connection(db_params).connection
   end
 
-  def ci_db_structure!(connection, database)
-    result = connection.execute("CREATE DATABASE #{database}")
-    return false unless result.present?
+  def auto_create_database!(connection, database)
+    connection.execute("CREATE DATABASE #{database}")
+  end
 
+  def auto_create_table_structure!(connection)
     # Ci::Schema.execute(username, password, port, host, database)
     # con_result = @connection.execute(Ci::Schema.statement)
 
     Ci::Schema.statement.split(';').map(&:strip).each do |sql|
-      con_result = @connection.execute(sql)
+      con_result = connection.execute(sql)
       Rails.logger.info "=============> ci create tabels result: #{con_result}"
     end
   end