FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewrite how mysql db is created to avoid external processes #132

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-01-09 20:47:03 -06:00
parent 07ca62920f
commit f16748167b
3 changed files with 86 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
app/Console/Commands/CreateDatabase.php
View File

@@ -2,6 +2,9 @@
namespace App\Console\Commands;
use Log;
use PDO;
use App\Console\BaseCommand;
class CreateDatabase extends BaseCommand
@@ -17,44 +20,44 @@ class CreateDatabase extends BaseCommand
}
/**
* create the mysql database
* Create the mysql database
* @param $dbkey
* @return bool
*/
protected function create_mysql($dbkey)
{
$exec = 'mysql';
if ($this->os->isWindowsLike()) {
$exec .= '.exe';
}
$host = config($dbkey . 'host');
$port = config($dbkey . 'port');
$name = config($dbkey . 'database');
$user = config($dbkey . 'username');
$pass = config($dbkey . 'password');
$mysql_cmd = [
$exec,
'-u' . config($dbkey . 'username'),
'-h' . config($dbkey . 'host'),
'-P' . config($dbkey . 'port'),
];
$dbSvc = new \App\Console\Services\Database();
# only supply password if it's set
$password = config($dbkey . 'password');
if ($password !== '') {
$mysql_cmd[] = '-p' . $password;
$dsn = $dbSvc->createDsn($host, $port);
Log::info('Connection string: ' . $dsn);
try {
$conn = $dbSvc->createPDO($dsn, $user, $pass);
} catch (\PDOException $e) {
Log::error($e);
return false;
}
if ($this->option('reset') === true) {
$cmd = array_merge(
$mysql_cmd,
["-e 'DROP DATABASE IF EXISTS " . config($dbkey . 'database') . "'"]
);
$this->runCommand($cmd);
try {
$conn->exec("DROP DATABASE IF EXISTS `$name`");
} catch (\PDOException $e) {
Log::error($e);
}
}
$cmd = array_merge(
$mysql_cmd,
["-e 'CREATE DATABASE IF NOT EXISTS " . config($dbkey . 'database') . "'"]
);
$this->runCommand($cmd);
try {
$conn->exec("CREATE DATABASE IF NOT EXISTS `$name`");
} catch (\PDOException $e) {
Log::error($e);
return false;
}
}
/**