deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Small fixes for SQL plugins (phpdocs, some fixes)

Browse source
This commit is contained in:
Dmitry Khomutov 2014-05-09 23:49:20 +07:00
parent 3174ec1e0b
commit 47b5dea03c
3 changed files with 61 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
PHPCI/Plugin.php
View file

@ -9,7 +9,6 @@
namespace PHPCI;
use PHPCI\Builder;
use PHPCI\Model\Build;
/**

42
PHPCI/Plugin/Mysql.php
View file

@ -22,24 +22,41 @@ use PHPCI\Model\Build;
*/
class Mysql implements \PHPCI\Plugin
{
/**
* @var \PHPCI\Builder
*/
protected $phpci;
/**
* @var \PHPCI\Model\Build
*/
protected $build;
/**
* @var array
*/
protected $queries = array();
/**
* @var string
*/
protected $host;
/**
* @var string
*/
protected $user;
/**
* @var string
*/
protected $pass;
/**
* Database Connection
* @var PDO
* @param Builder $phpci
* @param Build $build
* @param array $options
*/
protected $pdo;
public function __construct(Builder $phpci, Build $build, array $options = array())
{
$this->phpci = $phpci;
@ -74,19 +91,18 @@ class Mysql implements \PHPCI\Plugin
/**
* Connects to MySQL and runs a specified set of queries.
* @return boolean
*/
public function execute()
{
$success = true;
try {
$opts = array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION);
$this->pdo = new PDO('mysql:host=' . $this->host, $this->user, $this->pass, $opts);
$pdo = new PDO('mysql:host=' . $this->host, $this->user, $this->pass, $opts);
foreach ($this->queries as $query) {
if (!is_array($query)) {
// Simple query
$this->pdo->query($this->phpci->interpolate($query));
$pdo->query($this->phpci->interpolate($query));
} elseif (isset($query['import'])) {
// SQL file execution
$this->executeFile($query['import']);
@ -98,10 +114,14 @@ class Mysql implements \PHPCI\Plugin
$this->phpci->logFailure($ex->getMessage());
return false;
}
return $success;
return true;
}
/**
* @param string $query
* @return boolean
* @throws \Exception
*/
protected function executeFile($query)
{
if (!isset($query['file'])) {

33
PHPCI/Plugin/Pgsql.php
View file

@ -21,18 +21,45 @@ use PHPCI\Model\Build;
*/
class Pgsql implements \PHPCI\Plugin
{
/**
* @var \PHPCI\Builder
*/
protected $phpci;
/**
* @var \PHPCI\Model\Build
*/
protected $build;
/**
* @var array
*/
protected $queries = array();
/**
* @var string
*/
protected $host;
/**
* @var string
*/
protected $user;
/**
* @var string
*/
protected $pass;
/**
* @param Builder $phpci
* @param Build $build
* @param array $options
*/
public function __construct(Builder $phpci, Build $build, array $options = array())
{
$this->phpci = $phpci;
$this->build = $build;
$this->phpci = $phpci;
$this->build = $build;
$this->queries = $options;
$buildSettings = $phpci->getConfig('build_settings');
@ -47,6 +74,7 @@ class Pgsql implements \PHPCI\Plugin
/**
* Connects to PgSQL and runs a specified set of queries.
* @return boolean
*/
public function execute()
{
@ -61,7 +89,6 @@ class Pgsql implements \PHPCI\Plugin
$this->phpci->logFailure($ex->getMessage());
return false;
}
return true;
}
}