shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1483 from shahalpk/master

Browse Source 
Added support for db prefix in command line installer
This commit is contained in:
Denis Duliçi 2020-06-17 11:20:11 +03:00 committed by GitHub
commit 2ce18705c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Console/Commands/Install.php
View File

@ -15,6 +15,7 @@ class Install extends Command
const OPT_DB_NAME = 'db-name'; const OPT_DB_NAME = 'db-name';
const OPT_DB_USERNAME = 'db-username'; const OPT_DB_USERNAME = 'db-username';
const OPT_DB_PASSWORD = 'db-password'; const OPT_DB_PASSWORD = 'db-password';
const OPT_DB_PREFIX = 'db-prefix';
const OPT_COMPANY_NAME = 'company-name'; const OPT_COMPANY_NAME = 'company-name';
const OPT_COMPANY_EMAIL = 'company-email'; const OPT_COMPANY_EMAIL = 'company-email';
const OPT_ADMIN_EMAIL = 'admin-email'; const OPT_ADMIN_EMAIL = 'admin-email';
@ -33,6 +34,7 @@ class Install extends Command
{--db-name= : Name of the database} {--db-name= : Name of the database}
{--db-username=root : Username to use to access the database} {--db-username=root : Username to use to access the database}
{--db-password= : Password to use to access the database} {--db-password= : Password to use to access the database}
{--db-prefix= : Table name prefix}
{--company-name=My Company : Name of the company} {--company-name=My Company : Name of the company}
{--company-email=my@company.com : Email of the company} {--company-email=my@company.com : Email of the company}
{--admin-email= : Admin user email} {--admin-email= : Admin user email}
@ -102,10 +104,11 @@ class Install extends Command
'OPT_DB_NAME', 'OPT_DB_NAME',
'OPT_DB_USERNAME', 'OPT_DB_USERNAME',
'OPT_DB_PASSWORD', 'OPT_DB_PASSWORD',
'OPT_DB_PREFIX',
'OPT_COMPANY_NAME', 'OPT_COMPANY_NAME',
'OPT_COMPANY_EMAIL', 'OPT_COMPANY_EMAIL',
'OPT_ADMIN_EMAIL', 'OPT_ADMIN_EMAIL',
'OPT_ADMIN_PASSWORD', 'OPT_ADMIN_PASSWORD'
]; ];
foreach ($contants as $const) { foreach ($contants as $const) {
@ -177,10 +180,11 @@ class Install extends Command
$this->db_name = $this->option(self::OPT_DB_NAME); $this->db_name = $this->option(self::OPT_DB_NAME);
$this->db_username = $this->option(self::OPT_DB_USERNAME); $this->db_username = $this->option(self::OPT_DB_USERNAME);
$this->db_password = $this->option(self::OPT_DB_PASSWORD); $this->db_password = $this->option(self::OPT_DB_PASSWORD);
$this->db_prefix = $this->option(self::OPT_DB_PREFIX);
$this->line('Connecting to database ' . $this->db_name . '@' . $this->db_host . ':' . $this->db_port); $this->line('Connecting to database ' . $this->db_name . '@' . $this->db_host . ':' . $this->db_port);
if (!Installer::createDbTables($this->db_host, $this->db_port, $this->db_name, $this->db_username, $this->db_password)) { if (!Installer::createDbTables($this->db_host, $this->db_port, $this->db_name, $this->db_username, $this->db_password, $this->db_prefix)) {
$this->error('Error: Could not connect to the database! Please, make sure the details are correct.'); $this->error('Error: Could not connect to the database! Please, make sure the details are correct.');
return false; return false;

10
app/Utilities/Installer.php
View File

@ -141,14 +141,14 @@ class Installer
]); ]);
} }
public static function createDbTables($host, $port, $database, $username, $password) public static function createDbTables($host, $port, $database, $username, $password, $prefix = null)
{ {
if (!static::isDbValid($host, $port, $database, $username, $password)) { if (!static::isDbValid($host, $port, $database, $username, $password)) {
return false; return false;
} }
// Set database details // Set database details
static::saveDbVariables($host, $port, $database, $username, $password); static::saveDbVariables($host, $port, $database, $username, $password, $prefix);
// Try to increase the maximum execution time // Try to increase the maximum execution time
set_time_limit(300); // 5 minutes set_time_limit(300); // 5 minutes
@ -199,9 +199,11 @@ class Installer
return true; return true;
} }
public static function saveDbVariables($host, $port, $database, $username, $password) public static function saveDbVariables($host, $port, $database, $username, $password, $prefix = null)
{ {
$prefix = strtolower(Str::random(3) . '_'); if (is_null($prefix)){
$prefix = strtolower(Str::random(3) . '_');
}
// Update .env file // Update .env file
static::updateEnv([ static::updateEnv([