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

Improved DB + PostgreSQL support

Browse source
This commit is contained in:
Dmitry Khomutov 2017-01-29 09:49:43 +07:00
parent 5106cc5ba3
commit c90c292629
No known key found for this signature in database
GPG key ID: 7EB36C9576F9ECB9
26 changed files with 186 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/config.example.yml
View file

@ -1,9 +1,13 @@
b8: b8:
database: database:
servers: servers:
read: localhost read:
write: localhost - host: localhost
port: 3306 port: 3306
write:
- host: localhost
port: 3306
type: mysql
name: php-censor-db name: php-censor-db
username: php-censor-user username: php-censor-user
password: php-censor-password password: php-censor-password

40
src/B8Framework/Database.php
View file

@ -17,9 +17,11 @@ class Database extends \PDO
self::$servers['read'] = $settings['servers']['read']; self::$servers['read'] = $settings['servers']['read'];
self::$servers['write'] = $settings['servers']['write']; self::$servers['write'] = $settings['servers']['write'];
self::$details['type'] = $settings['type'];
self::$details['db'] = $settings['name']; self::$details['db'] = $settings['name'];
self::$details['user'] = $settings['username']; self::$details['user'] = $settings['username'];
self::$details['pass'] = $settings['password']; self::$details['pass'] = $settings['password'];
self::$initialised = true; self::$initialised = true;
} }
@ -42,14 +44,9 @@ class Database extends \PDO
} }
if (is_null(self::$connections[$type])) { if (is_null(self::$connections[$type])) {
if (is_array(self::$servers[$type])) { // Shuffle, so we pick a random server:
// Shuffle, so we pick a random server: $servers = self::$servers[$type];
$servers = self::$servers[$type]; shuffle($servers);
shuffle($servers);
} else {
// Only one server was specified
$servers = [self::$servers[$type]];
}
$connection = null; $connection = null;
@ -58,14 +55,16 @@ class Database extends \PDO
// Pull the next server: // Pull the next server:
$server = array_shift($servers); $server = array_shift($servers);
if (stristr($server, ':')) { $dns = self::$details['type'] . ':host=' . $server['host'];
list($host, $port) = explode(':', $server); if (isset($server['port'])) {
$server = $host . ';port=' . $port; $dns .= ';port=' . $server['port'];
} }
$dns .= ';dbname=' . self::$details['db'];
// Try to connect: // Try to connect:
try { try {
$connection = new self('mysql:host=' . $server . ';dbname=' . self::$details['db'], $connection = new self(
$dns,
self::$details['user'], self::$details['user'],
self::$details['pass'], self::$details['pass'],
[ [
@ -73,7 +72,8 @@ class Database extends \PDO
\PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION, \PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION,
\PDO::ATTR_TIMEOUT => 2, \PDO::ATTR_TIMEOUT => 2,
\PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES \'UTF8\'', \PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES \'UTF8\'',
]); ]
);
} catch (\PDOException $ex) { } catch (\PDOException $ex) {
$connection = false; $connection = false;
} }
@ -107,4 +107,18 @@ class Database extends \PDO
self::$lastUsed = ['read' => null, 'write' => null]; self::$lastUsed = ['read' => null, 'write' => null];
self::$initialised = false; self::$initialised = false;
} }
public function prepareCommon($statement, array $driver_options = [])
{
$quote = '';
if ('mysql' === self::$details['type']) {
$quote = '`';
} elseif ('pgsql' === self::$details['type']) {
$quote = '"';
}
$statement = preg_replace('/{{(.*?)}}/', ($quote . '\1' . $quote), $statement);
return parent::prepare($statement, $driver_options);
}
} }

32
src/B8Framework/Store.php
View file

@ -27,8 +27,8 @@ abstract class Store
$manualWheres = [], $manualWheres = [],
$whereType = 'AND' $whereType = 'AND'
) { ) {
$query = 'SELECT ' . $this->tableName . '.* FROM ' . $this->tableName; $query = 'SELECT * FROM {{' . $this->tableName . '}}';
$countQuery = 'SELECT COUNT(*) AS cnt FROM ' . $this->tableName; $countQuery = 'SELECT COUNT(*) AS {{count}} FROM {{' . $this->tableName . '}}';
$wheres = []; $wheres = [];
$params = []; $params = [];
@ -70,7 +70,7 @@ abstract class Store
} }
} else { } else {
$params[] = $item; $params[] = $item;
$ors[] = $this->fieldCheck($key) . ' ' . $value['operator'] . ' ?'; $ors[] = $key . ' ' . $value['operator'] . ' ?';
} }
} }
$wheres[] = '(' . implode(' OR ', $ors) . ')'; $wheres[] = '(' . implode(' OR ', $ors) . ')';
@ -98,16 +98,15 @@ abstract class Store
} }
} }
} else { } else {
$wheres[] = $key . ' IN (' . implode(', ', $wheres[] = $key . ' IN (' . implode(', ', array_map([Database::getConnection('read'), 'quote'], $value)) . ')';
array_map([Database::getConnection('read'), 'quote'], $value)) . ')';
} }
} }
} }
if (count($joins)) { if (count($joins)) {
foreach ($joins as $table => $join) { foreach ($joins as $table => $join) {
$query .= ' LEFT JOIN ' . $table . ' ' . $join['alias'] . ' ON ' . $join['on'] . ' '; $query .= ' LEFT JOIN {{' . $table . '}} AS ' . $join['alias'] . ' ON ' . $join['on'] . ' ';
$countQuery .= ' LEFT JOIN ' . $table . ' ' . $join['alias'] . ' ON ' . $join['on'] . ' '; $countQuery .= ' LEFT JOIN {{' . $table . '}} AS ' . $join['alias'] . ' ON ' . $join['on'] . ' ';
} }
} }
@ -173,16 +172,16 @@ abstract class Store
} }
try { try {
$stmt = Database::getConnection('read')->prepare($countQuery); $stmt = Database::getConnection('read')->prepareCommon($countQuery);
$stmt->execute($params); $stmt->execute($params);
$res = $stmt->fetch(\PDO::FETCH_ASSOC); $res = $stmt->fetch(\PDO::FETCH_ASSOC);
$count = (int)$res['cnt']; $count = (int)$res['count'];
} catch (\PDOException $ex) { } catch (\PDOException $ex) {
$count = 0; $count = 0;
} }
try { try {
$stmt = Database::getConnection('read')->prepare($query); $stmt = Database::getConnection('read')->prepareCommon($query);
$stmt->execute($params); $stmt->execute($params);
$res = $stmt->fetchAll(\PDO::FETCH_ASSOC); $res = $stmt->fetchAll(\PDO::FETCH_ASSOC);
$rtn = []; $rtn = [];
@ -232,8 +231,8 @@ abstract class Store
} }
if (count($updates)) { if (count($updates)) {
$qs = 'UPDATE ' . $this->tableName . ' SET ' . implode(', ', $updates) . ' WHERE ' . $this->primaryKey . ' = :primaryKey'; $qs = 'UPDATE {{' . $this->tableName . '}} SET ' . implode(', ', $updates) . ' WHERE {{' . $this->primaryKey . '}} = :primaryKey';
$q = Database::getConnection('write')->prepare($qs); $q = Database::getConnection('write')->prepareCommon($qs);
foreach ($update_params as $update_param) { foreach ($update_params as $update_param) {
$q->bindValue(':' . $update_param[0], $update_param[1]); $q->bindValue(':' . $update_param[0], $update_param[1]);
@ -266,9 +265,9 @@ abstract class Store
} }
if (count($cols)) { if (count($cols)) {
$qs = 'INSERT INTO ' . $this->tableName . ' (' . implode(', ', $cols) . ') VALUES (' . implode(', ', $qs = 'INSERT INTO {{' . $this->tableName . '}} (' . implode(', ', $cols) . ') VALUES (' . implode(', ',
$values) . ')'; $values) . ')';
$q = Database::getConnection('write')->prepare($qs); $q = Database::getConnection('write')->prepareCommon($qs);
if ($q->execute($qParams)) { if ($q->execute($qParams)) {
$id = !empty($data[$this->primaryKey]) ? $data[$this->primaryKey] : Database::getConnection('write')->lastInsertId(); $id = !empty($data[$this->primaryKey]) ? $data[$this->primaryKey] : Database::getConnection('write')->lastInsertId();
@ -291,16 +290,13 @@ abstract class Store
$data = $obj->getDataArray(); $data = $obj->getDataArray();
$q = Database::getConnection('write')->prepare('DELETE FROM ' . $this->tableName . ' WHERE ' . $this->primaryKey . ' = :primaryKey'); $q = Database::getConnection('write')->prepareCommon('DELETE FROM {{' . $this->tableName . '}} WHERE {{' . $this->primaryKey . '}} = :primaryKey');
$q->bindValue(':primaryKey', $data[$this->primaryKey]); $q->bindValue(':primaryKey', $data[$this->primaryKey]);
$q->execute(); $q->execute();
return true; return true;
} }
/**
*
*/
protected function fieldCheck($field) protected function fieldCheck($field)
{ {
if (empty($field)) { if (empty($field)) {

50
src/PHPCensor/Command/InstallCommand.php
View file

@ -15,6 +15,7 @@ use PDO;
use b8\Config; use b8\Config;
use b8\Store\Factory; use b8\Store\Factory;
use PHPCensor\Helper\Lang; use PHPCensor\Helper\Lang;
use PHPCensor\Model\ProjectGroup;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\QuestionHelper; use Symfony\Component\Console\Helper\QuestionHelper;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
@ -43,6 +44,7 @@ class InstallCommand extends Command
$this $this
->setName('php-censor:install') ->setName('php-censor:install')
->addOption('url', null, InputOption::VALUE_OPTIONAL, Lang::get('installation_url')) ->addOption('url', null, InputOption::VALUE_OPTIONAL, Lang::get('installation_url'))
->addOption('db-type', null, InputOption::VALUE_OPTIONAL, Lang::get('db_host'))
->addOption('db-host', null, InputOption::VALUE_OPTIONAL, Lang::get('db_host')) ->addOption('db-host', null, InputOption::VALUE_OPTIONAL, Lang::get('db_host'))
->addOption('db-port', null, InputOption::VALUE_OPTIONAL, Lang::get('db_port')) ->addOption('db-port', null, InputOption::VALUE_OPTIONAL, Lang::get('db_port'))
->addOption('db-name', null, InputOption::VALUE_OPTIONAL, Lang::get('db_name')) ->addOption('db-name', null, InputOption::VALUE_OPTIONAL, Lang::get('db_name'))
@ -104,8 +106,11 @@ class InstallCommand extends Command
$this->writeConfigFile($conf); $this->writeConfigFile($conf);
$this->setupDatabase($output); $this->setupDatabase($output);
$admin = $this->getAdminInformation($input, $output); $admin = $this->getAdminInformation($input, $output);
$this->createAdminUser($admin, $output); $this->createAdminUser($admin, $output);
$this->createDefaultGroup($output);
} }
/** /**
@ -127,7 +132,7 @@ class InstallCommand extends Command
} }
// Check required extensions are present: // Check required extensions are present:
$requiredExtensions = ['PDO', 'pdo_mysql']; $requiredExtensions = ['PDO'];
foreach ($requiredExtensions as $extension) { foreach ($requiredExtensions as $extension) {
if (!extension_loaded($extension)) { if (!extension_loaded($extension)) {
@ -300,6 +305,11 @@ class InstallCommand extends Command
/** @var $helper QuestionHelper */ /** @var $helper QuestionHelper */
$helper = $this->getHelperSet()->get('question'); $helper = $this->getHelperSet()->get('question');
if (!$dbType = $input->getOption('db-type')) {
$questionType = new Question(Lang::get('enter_db_type'), 'mysql');
$dbType = $helper->ask($input, $output, $questionType);
}
if (!$dbHost = $input->getOption('db-host')) { if (!$dbHost = $input->getOption('db-host')) {
$questionHost = new Question(Lang::get('enter_db_host'), 'localhost'); $questionHost = new Question(Lang::get('enter_db_host'), 'localhost');
$dbHost = $helper->ask($input, $output, $questionHost); $dbHost = $helper->ask($input, $output, $questionHost);
@ -327,12 +337,18 @@ class InstallCommand extends Command
$dbPass = $helper->ask($input, $output, $questionPass); $dbPass = $helper->ask($input, $output, $questionPass);
} }
$db['servers']['read'] = $dbHost; $db['servers']['read'] = [[
$db['servers']['write'] = $dbHost; 'host' => $dbHost,
$db['port'] = $dbPort; 'port' => $dbPort,
$db['name'] = $dbName; ]];
$db['username'] = $dbUser; $db['servers']['write'] = [[
$db['password'] = $dbPass; 'host' => $dbHost,
'port' => $dbPort,
]];
$db['type'] = $dbType;
$db['name'] = $dbName;
$db['username'] = $dbUser;
$db['password'] = $dbPass;
return $db; return $db;
} }
@ -347,7 +363,7 @@ class InstallCommand extends Command
{ {
try { try {
$pdo = new PDO( $pdo = new PDO(
'mysql:host='.$db['servers']['write'].';port='.$db['port'].'dbname='.$db['name'], $db['type'] . ':host=' . $db['servers']['write'][0]['host'] . ';port=' . $db['servers']['write'][0]['host'] . 'dbname=' . $db['name'],
$db['username'], $db['username'],
$db['password'], $db['password'],
[ [
@ -413,6 +429,24 @@ class InstallCommand extends Command
} }
} }
/**
* @param OutputInterface $output
*/
protected function createDefaultGroup($output)
{
try {
$group = new ProjectGroup();
$group->setTitle('Projects');
Factory::getStore('ProjectGroup')->save($group);
$output->writeln('<info>'.Lang::get('default_group_created').'</info>');
} catch (\Exception $ex) {
$output->writeln('<error>'.Lang::get('default_group_failed_to_create').'</error>');
$output->writeln('<error>' . $ex->getMessage() . '</error>');
}
}
protected function reloadConfig() protected function reloadConfig()
{ {
$config = Config::getInstance(); $config = Config::getInstance();

5
src/PHPCensor/Console/Application.php
View file

@ -33,8 +33,9 @@ class Application extends BaseApplication
'default_migration_table' => 'migration', 'default_migration_table' => 'migration',
'default_database' => 'php-censor', 'default_database' => 'php-censor',
'php-censor' => [ 'php-censor' => [
'adapter' => 'mysql', 'adapter' => $databaseSettings['type'],
'host' => $databaseSettings['servers']['write'], 'host' => $databaseSettings['servers']['write'][0]['host'],
'port' => $databaseSettings['servers']['write'][0]['port'],
'name' => $databaseSettings['name'], 'name' => $databaseSettings['name'],
'user' => $databaseSettings['username'], 'user' => $databaseSettings['username'],
'pass' => $databaseSettings['password'], 'pass' => $databaseSettings['password'],

12
src/PHPCensor/Migrations/20140730143702_fix_database_columns.php
View file

@ -6,13 +6,6 @@ class FixDatabaseColumns extends AbstractMigration
{ {
public function up() public function up()
{ {
$dbAdapter = $this->getAdapter();
if ($dbAdapter instanceof \Phinx\Db\Adapter\PdoAdapter) {
$pdo = $dbAdapter->getConnection();
$pdo->exec('SET foreign_key_checks = 0');
}
$build = $this->table('build'); $build = $this->table('build');
$build->changeColumn('project_id', 'integer', ['null' => false]); $build->changeColumn('project_id', 'integer', ['null' => false]);
@ -53,11 +46,6 @@ class FixDatabaseColumns extends AbstractMigration
$user->changeColumn('hash', 'string', ['limit' => 250, 'null' => false]); $user->changeColumn('hash', 'string', ['limit' => 250, 'null' => false]);
$user->changeColumn('is_admin', 'integer', ['null' => false, 'default' => 0]); $user->changeColumn('is_admin', 'integer', ['null' => false, 'default' => 0]);
$user->changeColumn('name', 'string', ['limit' => 250, 'null' => false]); $user->changeColumn('name', 'string', ['limit' => 250, 'null' => false]);
if ($dbAdapter instanceof \Phinx\Db\Adapter\PdoAdapter) {
$pdo = $dbAdapter->getConnection();
$pdo->exec('SET foreign_key_checks = 1');
}
} }
public function down() public function down()

2
src/PHPCensor/Migrations/20150131075425_archive_project.php
View file

@ -9,7 +9,7 @@ class ArchiveProject extends AbstractMigration
$project = $this->table('project'); $project = $this->table('project');
if (!$project->hasColumn('archived')) { if (!$project->hasColumn('archived')) {
$project->addColumn('archived', 'boolean', ['default' => 0])->save(); $project->addColumn('archived', 'boolean', ['default' => false])->save();
} }
} }

5
src/PHPCensor/Migrations/20150203105015_fix_column_types.php
View file

@ -1,7 +1,6 @@
<?php <?php
use Phinx\Migration\AbstractMigration; use Phinx\Migration\AbstractMigration;
use Phinx\Db\Adapter\MysqlAdapter;
class FixColumnTypes extends AbstractMigration class FixColumnTypes extends AbstractMigration
{ {
@ -9,11 +8,11 @@ class FixColumnTypes extends AbstractMigration
{ {
$build = $this->table('build'); $build = $this->table('build');
$build->changeColumn('log', 'text', ['null' => true, 'limit' => MysqlAdapter::TEXT_MEDIUM]); $build->changeColumn('log', 'text', ['null' => true]);
$buildMeta = $this->table('build_meta'); $buildMeta = $this->table('build_meta');
$buildMeta->changeColumn('meta_value', 'text', ['null' => false, 'limit' => MysqlAdapter::TEXT_MEDIUM]); $buildMeta->changeColumn('meta_value', 'text', ['null' => false]);
} }
public function down() public function down()

5
src/PHPCensor/Migrations/20150308074509_add_user_providers.php
View file

@ -1,6 +1,5 @@
<?php <?php
use Phinx\Db\Adapter\MysqlAdapter;
use Phinx\Migration\AbstractMigration; use Phinx\Migration\AbstractMigration;
class AddUserProviders extends AbstractMigration class AddUserProviders extends AbstractMigration
@ -16,12 +15,12 @@ class AddUserProviders extends AbstractMigration
// The provider name // The provider name
->addColumn('provider_key', 'string', [ ->addColumn('provider_key', 'string', [
'default' => 'internal', 'default' => 'internal',
'limit' => MysqlAdapter::TEXT_SMALL 'limit' => 255
]) ])
// A data used by the provider // A data used by the provider
->addColumn('provider_data', 'string', [ ->addColumn('provider_data', 'string', [
'null' => true, 'null' => true,
'limit' => MysqlAdapter::TEXT_SMALL 'limit' => 255
]) ])
->save(); ->save();
} }

8
src/PHPCensor/Migrations/20151008140800_add_project_groups.php
View file

@ -13,12 +13,14 @@ class AddProjectGroups extends AbstractMigration
} }
if (!$table->hasColumn('title')) { if (!$table->hasColumn('title')) {
$table->addColumn('title', 'string', ['limit' => 100, 'null' => false])->save(); $table
->addColumn('title', 'string', ['limit' => 100, 'null' => false])
->save();
$group = new \PHPCensor\Model\ProjectGroup(); /* $group = new \PHPCensor\Model\ProjectGroup();
$group->setTitle('Projects'); $group->setTitle('Projects');
\b8\Store\Factory::getStore('ProjectGroup')->save($group); \b8\Store\Factory::getStore('ProjectGroup')->save($group);*/
} }
$table = $this->table('project'); $table = $this->table('project');

4
src/PHPCensor/Migrations/20151009100610_remove_unique_name_index.php
View file

@ -9,11 +9,11 @@ class RemoveUniqueNameIndex extends AbstractMigration
$user = $this->table('user'); $user = $this->table('user');
if ($user->hasIndex('name', ['unique' => true])) { if ($user->hasIndex('name', ['unique' => true])) {
$user->removeIndex('name', ['unique' => true])->save(); $user->removeIndex(['name'], ['unique' => true])->save();
} }
if (!$user->hasIndex('name', ['unique' => true])) { if (!$user->hasIndex('name', ['unique' => true])) {
$user->addIndex('name', ['unique' => false])->save(); $user->addIndex(['name'], ['unique' => false])->save();
} }
} }
} }

3
src/PHPCensor/Migrations/20151014091859_errors_table.php
View file

@ -1,7 +1,6 @@
<?php <?php
use Phinx\Migration\AbstractMigration; use Phinx\Migration\AbstractMigration;
use Phinx\Db\Adapter\MysqlAdapter;
class ErrorsTable extends AbstractMigration class ErrorsTable extends AbstractMigration
{ {
@ -34,7 +33,7 @@ class ErrorsTable extends AbstractMigration
} }
if (!$table->hasColumn('severity')) { if (!$table->hasColumn('severity')) {
$table->addColumn('severity', 'integer', ['signed' => false, 'limit' => MysqlAdapter::INT_TINY])->save(); $table->addColumn('severity', 'integer', ['signed' => false, 'limit' => 255])->save();
} }
if (!$table->hasColumn('message')) { if (!$table->hasColumn('message')) {

8
src/PHPCensor/Migrations/20160623100223_project_table_defaults.php
View file

@ -1,17 +1,13 @@
<?php <?php
use Phinx\Migration\AbstractMigration; use Phinx\Migration\AbstractMigration;
use Phinx\Db\Adapter\MysqlAdapter;
class ProjectTableDefaults extends AbstractMigration class ProjectTableDefaults extends AbstractMigration
{ {
public function change() public function change()
{ {
$this->table('project') $this->table('project')
->changeColumn('build_config', MysqlAdapter::PHINX_TYPE_TEXT, ['null' => true]) ->changeColumn('build_config', 'text', ['null' => true])
->changeColumn('archived', MysqlAdapter::PHINX_TYPE_INTEGER, [ ->save();
'length' => MysqlAdapter::INT_TINY,
'default' => 0,
])->save();
} }
} }

1
src/PHPCensor/Plugin/Codeception.php
View file

@ -16,7 +16,6 @@ use PHPCensor\Plugin\Util\TestResultParsers\Codeception as Parser;
use PHPCensor\Plugin; use PHPCensor\Plugin;
use Symfony\Component\Yaml\Parser as YamlParser; use Symfony\Component\Yaml\Parser as YamlParser;
use PHPCensor\ZeroConfigPluginInterface; use PHPCensor\ZeroConfigPluginInterface;
use Psr\Log\LogLevel;
/** /**
* Codeception Plugin - Enables full acceptance, unit, and functional testing. * Codeception Plugin - Enables full acceptance, unit, and functional testing.

8
src/PHPCensor/Store/Base/BuildErrorStoreBase.php
View file

@ -38,8 +38,8 @@ class BuildErrorStoreBase extends Store
throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
} }
$query = 'SELECT * FROM `build_error` WHERE `id` = :id LIMIT 1'; $query = 'SELECT * FROM {{build_error}} WHERE {{id}} = :id LIMIT 1';
$stmt = Database::getConnection($useConnection)->prepare($query); $stmt = Database::getConnection($useConnection)->prepareCommon($query);
$stmt->bindValue(':id', $value); $stmt->bindValue(':id', $value);
if ($stmt->execute()) { if ($stmt->execute()) {
@ -62,8 +62,8 @@ class BuildErrorStoreBase extends Store
} }
$query = 'SELECT * FROM `build_error` WHERE `build_id` = :build_id LIMIT :limit'; $query = 'SELECT * FROM {{build_error}} WHERE {{build_id}} = :build_id LIMIT :limit';
$stmt = Database::getConnection($useConnection)->prepare($query); $stmt = Database::getConnection($useConnection)->prepareCommon($query);
$stmt->bindValue(':build_id', $value); $stmt->bindValue(':build_id', $value);
$stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT); $stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT);

12
src/PHPCensor/Store/Base/BuildMetaStoreBase.php
View file

@ -38,8 +38,8 @@ class BuildMetaStoreBase extends Store
throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
} }
$query = 'SELECT * FROM `build_meta` WHERE `id` = :id LIMIT 1'; $query = 'SELECT * FROM {{build_meta}} WHERE {{id}} = :id LIMIT 1';
$stmt = Database::getConnection($useConnection)->prepare($query); $stmt = Database::getConnection($useConnection)->prepareCommon($query);
$stmt->bindValue(':id', $value); $stmt->bindValue(':id', $value);
if ($stmt->execute()) { if ($stmt->execute()) {
@ -62,8 +62,8 @@ class BuildMetaStoreBase extends Store
} }
$query = 'SELECT * FROM `build_meta` WHERE `project_id` = :project_id LIMIT :limit'; $query = 'SELECT * FROM {{build_meta}} WHERE {{project_id}} = :project_id LIMIT :limit';
$stmt = Database::getConnection($useConnection)->prepare($query); $stmt = Database::getConnection($useConnection)->prepareCommon($query);
$stmt->bindValue(':project_id', $value); $stmt->bindValue(':project_id', $value);
$stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT); $stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT);
@ -94,8 +94,8 @@ class BuildMetaStoreBase extends Store
} }
$query = 'SELECT * FROM `build_meta` WHERE `build_id` = :build_id LIMIT :limit'; $query = 'SELECT * FROM {{build_meta}} WHERE {{build_id}} = :build_id LIMIT :limit';
$stmt = Database::getConnection($useConnection)->prepare($query); $stmt = Database::getConnection($useConnection)->prepareCommon($query);
$stmt->bindValue(':build_id', $value); $stmt->bindValue(':build_id', $value);
$stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT); $stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT);

12
src/PHPCensor/Store/Base/BuildStoreBase.php
View file

@ -38,8 +38,8 @@ class BuildStoreBase extends Store
throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
} }
$query = 'SELECT * FROM `build` WHERE `id` = :id LIMIT 1'; $query = 'SELECT * FROM {{build}} WHERE {{id}} = :id LIMIT 1';
$stmt = Database::getConnection($useConnection)->prepare($query); $stmt = Database::getConnection($useConnection)->prepareCommon($query);
$stmt->bindValue(':id', $value); $stmt->bindValue(':id', $value);
if ($stmt->execute()) { if ($stmt->execute()) {
@ -62,8 +62,8 @@ class BuildStoreBase extends Store
} }
$query = 'SELECT * FROM `build` WHERE `project_id` = :project_id LIMIT :limit'; $query = 'SELECT * FROM {{build}} WHERE {{project_id}} = :project_id LIMIT :limit';
$stmt = Database::getConnection($useConnection)->prepare($query); $stmt = Database::getConnection($useConnection)->prepareCommon($query);
$stmt->bindValue(':project_id', $value); $stmt->bindValue(':project_id', $value);
$stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT); $stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT);
@ -94,8 +94,8 @@ class BuildStoreBase extends Store
} }
$query = 'SELECT * FROM `build` WHERE `status` = :status LIMIT :limit'; $query = 'SELECT * FROM {{build}} WHERE {{status}} = :status LIMIT :limit';
$stmt = Database::getConnection($useConnection)->prepare($query); $stmt = Database::getConnection($useConnection)->prepareCommon($query);
$stmt->bindValue(':status', $value); $stmt->bindValue(':status', $value);
$stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT); $stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT);

4
src/PHPCensor/Store/Base/ProjectGroupStoreBase.php
View file

@ -38,8 +38,8 @@ class ProjectGroupStoreBase extends Store
throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
} }
$query = 'SELECT * FROM `project_group` WHERE `id` = :id LIMIT 1'; $query = 'SELECT * FROM {{project_group}} WHERE {{id}} = :id LIMIT 1';
$stmt = Database::getConnection($useConnection)->prepare($query); $stmt = Database::getConnection($useConnection)->prepareCommon($query);
$stmt->bindValue(':id', $value); $stmt->bindValue(':id', $value);
if ($stmt->execute()) { if ($stmt->execute()) {

12
src/PHPCensor/Store/Base/ProjectStoreBase.php
View file

@ -38,8 +38,8 @@ class ProjectStoreBase extends Store
throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
} }
$query = 'SELECT * FROM `project` WHERE `id` = :id LIMIT 1'; $query = 'SELECT * FROM {{project}} WHERE {{id}} = :id LIMIT 1';
$stmt = Database::getConnection($useConnection)->prepare($query); $stmt = Database::getConnection($useConnection)->prepareCommon($query);
$stmt->bindValue(':id', $value); $stmt->bindValue(':id', $value);
if ($stmt->execute()) { if ($stmt->execute()) {
@ -62,8 +62,8 @@ class ProjectStoreBase extends Store
} }
$query = 'SELECT * FROM `project` WHERE `title` = :title LIMIT :limit'; $query = 'SELECT * FROM {{project}} WHERE {{title}} = :title LIMIT :limit';
$stmt = Database::getConnection($useConnection)->prepare($query); $stmt = Database::getConnection($useConnection)->prepareCommon($query);
$stmt->bindValue(':title', $value); $stmt->bindValue(':title', $value);
$stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT); $stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT);
@ -94,8 +94,8 @@ class ProjectStoreBase extends Store
} }
$query = 'SELECT * FROM `project` WHERE `group_id` = :group_id LIMIT :limit'; $query = 'SELECT * FROM {{project}} WHERE {{group_id}} = :group_id LIMIT :limit';
$stmt = Database::getConnection($useConnection)->prepare($query); $stmt = Database::getConnection($useConnection)->prepareCommon($query);
$stmt->bindValue(':group_id', $value); $stmt->bindValue(':group_id', $value);
$stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT); $stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT);

17
src/PHPCensor/Store/Base/UserStoreBase.php
View file

@ -38,8 +38,8 @@ class UserStoreBase extends Store
throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
} }
$query = 'SELECT * FROM `user` WHERE `id` = :id LIMIT 1'; $query = 'SELECT * FROM {{user}} WHERE {{id}} = :id LIMIT 1';
$stmt = Database::getConnection($useConnection)->prepare($query); $stmt = Database::getConnection($useConnection)->prepareCommon($query);
$stmt->bindValue(':id', $value); $stmt->bindValue(':id', $value);
if ($stmt->execute()) { if ($stmt->execute()) {
@ -67,8 +67,8 @@ class UserStoreBase extends Store
throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
} }
$query = 'SELECT * FROM `user` WHERE `email` = :email LIMIT 1'; $query = 'SELECT * FROM {{user}} WHERE {{email}} = :email LIMIT 1';
$stmt = Database::getConnection()->prepare($query); $stmt = Database::getConnection()->prepareCommon($query);
$stmt->bindValue(':email', $value); $stmt->bindValue(':email', $value);
if ($stmt->execute()) { if ($stmt->execute()) {
@ -96,8 +96,8 @@ class UserStoreBase extends Store
throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
} }
$query = 'SELECT * FROM `user` WHERE `email` = :value OR `name` = :value LIMIT 1'; $query = 'SELECT * FROM {{user}} WHERE {{email}} = :value OR {{name}} = :value LIMIT 1';
$stmt = Database::getConnection()->prepare($query); $stmt = Database::getConnection()->prepareCommon($query);
$stmt->bindValue(':value', $value); $stmt->bindValue(':value', $value);
if ($stmt->execute()) { if ($stmt->execute()) {
@ -119,9 +119,8 @@ class UserStoreBase extends Store
throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
} }
$query = 'SELECT * FROM {{user}} WHERE {{name}} = :name LIMIT :limit';
$query = 'SELECT * FROM `user` WHERE `name` = :name LIMIT :limit'; $stmt = Database::getConnection($useConnection)->prepareCommon($query);
$stmt = Database::getConnection($useConnection)->prepare($query);
$stmt->bindValue(':name', $value); $stmt->bindValue(':name', $value);
$stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT); $stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT);

11
src/PHPCensor/Store/BuildErrorStore.php
View file

@ -24,8 +24,7 @@ class BuildErrorStore extends BuildErrorStoreBase
*/ */
public function getErrorsForBuild($buildId, $since = null) public function getErrorsForBuild($buildId, $since = null)
{ {
$query = 'SELECT * FROM build_error $query = 'SELECT * FROM {{build_error}} WHERE {{build_id}} = :build';
WHERE build_id = :build';
if (!is_null($since)) { if (!is_null($since)) {
$query .= ' AND created_date > :since'; $query .= ' AND created_date > :since';
@ -33,7 +32,7 @@ class BuildErrorStore extends BuildErrorStoreBase
$query .= ' LIMIT 15000'; $query .= ' LIMIT 15000';
$stmt = Database::getConnection('read')->prepare($query); $stmt = Database::getConnection('read')->prepareCommon($query);
$stmt->bindValue(':build', $buildId, \PDO::PARAM_INT); $stmt->bindValue(':build', $buildId, \PDO::PARAM_INT);
@ -63,10 +62,10 @@ class BuildErrorStore extends BuildErrorStoreBase
*/ */
public function getErrorTotalForBuild($buildId) public function getErrorTotalForBuild($buildId)
{ {
$query = 'SELECT COUNT(*) AS total FROM build_error $query = 'SELECT COUNT(*) AS {{total}} FROM {{build_error}}
WHERE build_id = :build'; WHERE {{build_id}} = :build';
$stmt = Database::getConnection('read')->prepare($query); $stmt = Database::getConnection('read')->prepareCommon($query);
$stmt->bindValue(':build', $buildId, \PDO::PARAM_INT); $stmt->bindValue(':build', $buildId, \PDO::PARAM_INT);

8
src/PHPCensor/Store/BuildMetaStore.php
View file

@ -28,11 +28,11 @@ class BuildMetaStore extends BuildMetaStoreBase
*/ */
public function getErrorsForUpgrade($limit) public function getErrorsForUpgrade($limit)
{ {
$query = 'SELECT * FROM build_meta $query = 'SELECT * FROM {{build_meta}}
WHERE meta_key IN (\'phpmd-data\', \'phpcs-data\', \'phpdoccheck-data\', \'technical_debt - data\') WHERE {{meta_key}} IN (\'phpmd-data\', \'phpcs-data\', \'phpdoccheck-data\', \'technical_debt - data\')
ORDER BY id ASC LIMIT :limit'; ORDER BY {{id}} ASC LIMIT :limit';
$stmt = Database::getConnection('read')->prepare($query); $stmt = Database::getConnection('read')->prepareCommon($query);
$stmt->bindValue(':limit', $limit, \PDO::PARAM_INT); $stmt->bindValue(':limit', $limit, \PDO::PARAM_INT);

30
src/PHPCensor/Store/BuildStore.php
View file

@ -30,12 +30,12 @@ class BuildStore extends BuildStoreBase
public function getLatestBuilds($projectId = null, $limit = 5) public function getLatestBuilds($projectId = null, $limit = 5)
{ {
if (!is_null($projectId)) { if (!is_null($projectId)) {
$query = 'SELECT * FROM build WHERE `project_id` = :pid ORDER BY id DESC LIMIT :limit'; $query = 'SELECT * FROM {{build}} WHERE {{project_id}} = :pid ORDER BY {{id}} DESC LIMIT :limit';
} else { } else {
$query = 'SELECT * FROM build ORDER BY id DESC LIMIT :limit'; $query = 'SELECT * FROM {{build}} ORDER BY {{id}} DESC LIMIT :limit';
} }
$stmt = Database::getConnection('read')->prepare($query); $stmt = Database::getConnection('read')->prepareCommon($query);
if (!is_null($projectId)) { if (!is_null($projectId)) {
$stmt->bindValue(':pid', $projectId); $stmt->bindValue(':pid', $projectId);
@ -65,8 +65,8 @@ class BuildStore extends BuildStoreBase
*/ */
public function getLastBuildByStatus($projectId = null, $status = Build::STATUS_SUCCESS) public function getLastBuildByStatus($projectId = null, $status = Build::STATUS_SUCCESS)
{ {
$query = 'SELECT * FROM build WHERE project_id = :pid AND status = :status ORDER BY id DESC LIMIT 1'; $query = 'SELECT * FROM {{build}} WHERE {{project_id}} = :pid AND {{status}} = :status ORDER BY {{id}} DESC LIMIT 1';
$stmt = Database::getConnection('read')->prepare($query); $stmt = Database::getConnection('read')->prepareCommon($query);
$stmt->bindValue(':pid', $projectId); $stmt->bindValue(':pid', $projectId);
$stmt->bindValue(':status', $status); $stmt->bindValue(':status', $status);
@ -87,8 +87,8 @@ class BuildStore extends BuildStoreBase
*/ */
public function getByProjectAndCommit($projectId, $commitId) public function getByProjectAndCommit($projectId, $commitId)
{ {
$query = 'SELECT * FROM `build` WHERE `project_id` = :project_id AND `commit_id` = :commit_id'; $query = 'SELECT * FROM {{build}} WHERE {{project_id}} = :project_id AND {{commit_id}} = :commit_id';
$stmt = Database::getConnection('read')->prepare($query); $stmt = Database::getConnection('read')->prepareCommon($query);
$stmt->bindValue(':project_id', $projectId); $stmt->bindValue(':project_id', $projectId);
$stmt->bindValue(':commit_id', $commitId); $stmt->bindValue(':commit_id', $commitId);
@ -116,8 +116,8 @@ class BuildStore extends BuildStoreBase
*/ */
public function getBuildBranches($projectId) public function getBuildBranches($projectId)
{ {
$query = 'SELECT DISTINCT `branch` FROM `build` WHERE `project_id` = :project_id'; $query = 'SELECT DISTINCT {{branch}} FROM {{build}} WHERE {{project_id}} = :project_id';
$stmt = Database::getConnection('read')->prepare($query); $stmt = Database::getConnection('read')->prepareCommon($query);
$stmt->bindValue(':project_id', $projectId); $stmt->bindValue(':project_id', $projectId);
if ($stmt->execute()) { if ($stmt->execute()) {
@ -140,8 +140,8 @@ class BuildStore extends BuildStoreBase
public function getMeta($key, $projectId, $buildId = null, $branch = null, $numResults = 1) public function getMeta($key, $projectId, $buildId = null, $branch = null, $numResults = 1)
{ {
$query = 'SELECT bm.build_id, bm.meta_key, bm.meta_value $query = 'SELECT bm.build_id, bm.meta_key, bm.meta_value
FROM build_meta AS bm FROM {{build_meta}} AS {{bm}}
LEFT JOIN build b ON b.id = bm.build_id LEFT JOIN {{build}} AS {{b}} ON b.id = bm.build_id
WHERE bm.meta_key = :key WHERE bm.meta_key = :key
AND bm.project_id = :projectId'; AND bm.project_id = :projectId';
@ -160,7 +160,7 @@ class BuildStore extends BuildStoreBase
$query .= ' ORDER BY bm.id DESC LIMIT :numResults'; $query .= ' ORDER BY bm.id DESC LIMIT :numResults';
$stmt = Database::getConnection('read')->prepare($query); $stmt = Database::getConnection('read')->prepareCommon($query);
$stmt->bindValue(':key', $key, \PDO::PARAM_STR); $stmt->bindValue(':key', $key, \PDO::PARAM_STR);
$stmt->bindValue(':projectId', (int)$projectId, \PDO::PARAM_INT); $stmt->bindValue(':projectId', (int)$projectId, \PDO::PARAM_INT);
$stmt->bindValue(':buildId', (int)$buildId, \PDO::PARAM_INT); $stmt->bindValue(':buildId', (int)$buildId, \PDO::PARAM_INT);
@ -199,10 +199,10 @@ class BuildStore extends BuildStoreBase
*/ */
public function setMeta($projectId, $buildId, $key, $value) public function setMeta($projectId, $buildId, $key, $value)
{ {
$cols = '`project_id`, `build_id`, `meta_key`, `meta_value`'; $cols = '{{project_id}}, {{build_id}}, {{meta_key}}, {{meta_value}}';
$query = 'REPLACE INTO build_meta ('.$cols.') VALUES (:projectId, :buildId, :key, :value)'; $query = 'INSERT INTO {{build_meta}} ('.$cols.') VALUES (:projectId, :buildId, :key, :value)';
$stmt = Database::getConnection('read')->prepare($query); $stmt = Database::getConnection('read')->prepareCommon($query);
$stmt->bindValue(':key', $key, \PDO::PARAM_STR); $stmt->bindValue(':key', $key, \PDO::PARAM_STR);
$stmt->bindValue(':projectId', (int)$projectId, \PDO::PARAM_INT); $stmt->bindValue(':projectId', (int)$projectId, \PDO::PARAM_INT);
$stmt->bindValue(':buildId', (int)$buildId, \PDO::PARAM_INT); $stmt->bindValue(':buildId', (int)$buildId, \PDO::PARAM_INT);

12
src/PHPCensor/Store/ProjectStore.php
View file

@ -28,8 +28,8 @@ class ProjectStore extends ProjectStoreBase
*/ */
public function getKnownBranches($projectId) public function getKnownBranches($projectId)
{ {
$query = 'SELECT DISTINCT branch from build WHERE project_id = :pid'; $query = 'SELECT DISTINCT {{branch}} from {{build}} WHERE {{project_id}} = :pid';
$stmt = Database::getConnection('read')->prepare($query); $stmt = Database::getConnection('read')->prepareCommon($query);
$stmt->bindValue(':pid', $projectId); $stmt->bindValue(':pid', $projectId);
if ($stmt->execute()) { if ($stmt->execute()) {
@ -57,8 +57,8 @@ class ProjectStore extends ProjectStoreBase
{ {
$archived = (integer)$archived; $archived = (integer)$archived;
$query = 'SELECT * FROM `project` WHERE `archived` = :archived ORDER BY `title` ASC'; $query = 'SELECT * FROM {{project}} WHERE {{archived}} = :archived ORDER BY {{title}} ASC';
$stmt = Database::getConnection('read')->prepare($query); $stmt = Database::getConnection('read')->prepareCommon($query);
$stmt->bindValue(':archived', $archived); $stmt->bindValue(':archived', $archived);
@ -98,8 +98,8 @@ class ProjectStore extends ProjectStoreBase
} }
$archived = (integer)$archived; $archived = (integer)$archived;
$query = 'SELECT * FROM `project` WHERE `group_id` = :group_id AND `archived` = :archived ORDER BY title LIMIT :limit'; $query = 'SELECT * FROM {{project}} WHERE {{group_id}} = :group_id AND {{archived}} = :archived ORDER BY {{title}} LIMIT :limit';
$stmt = Database::getConnection($useConnection)->prepare($query); $stmt = Database::getConnection($useConnection)->prepareCommon($query);
$stmt->bindValue(':group_id', $value); $stmt->bindValue(':group_id', $value);
$stmt->bindValue(':archived', $archived); $stmt->bindValue(':archived', $archived);

18
tests/B8Framework/DatabaseTest.php
View file

@ -13,9 +13,14 @@ class DatabaseTest extends \PHPUnit_Framework_TestCase
'b8' => [ 'b8' => [
'database' => [ 'database' => [
'servers' => [ 'servers' => [
'read' => 'localhost', 'read' => [
'write' => 'localhost', ['host' => 'localhost'],
],
'write' => [
['host' => 'localhost'],
],
], ],
'type' => 'mysql',
'name' => 'b8_test', 'name' => 'b8_test',
'username' => 'root', 'username' => 'root',
'password' => 'root', 'password' => 'root',
@ -69,9 +74,14 @@ class DatabaseTest extends \PHPUnit_Framework_TestCase
'b8' => [ 'b8' => [
'database' => [ 'database' => [
'servers' => [ 'servers' => [
'read' => 'localhost', 'read' => [
'write' => 'localhost', ['host' => 'localhost'],
],
'write' => [
['host' => 'localhost'],
],
], ],
'type' => 'mysql',
'name' => 'b8_test_2', 'name' => 'b8_test_2',
'username' => '', 'username' => '',
'password' => '', 'password' => '',

4
tests/PHPCensor/Command/InstallCommandTest.php
View file

@ -144,8 +144,8 @@ class InstallCommandTest extends \PHPUnit_Framework_TestCase
$this->executeWithoutParam('--db-host', $dialog); $this->executeWithoutParam('--db-host', $dialog);
// Check that specified arguments are correctly loaded. // Check that specified arguments are correctly loaded.
$this->assertEquals('testedvalue', $this->config['b8']['database']['servers']['read']); $this->assertEquals('testedvalue', $this->config['b8']['database']['servers']['read'][0]['host']);
$this->assertEquals('testedvalue', $this->config['b8']['database']['servers']['write']); $this->assertEquals('testedvalue', $this->config['b8']['database']['servers']['write'][0]['host']);
} }
public function testDatabaseNameConfig() public function testDatabaseNameConfig()