mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity

[ticket/11219] Only update sequences that are affected by a fixture

Browse Source 
PHPBB3-11219
This commit is contained in:
Patrick Webster 2012-12-01 22:34:03 -06:00
parent 1dff6d1bf9
commit 720ef233b1
2 changed files with 55 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/test_framework/phpbb_database_test_case.php
View File

@ -13,6 +13,8 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
protected $test_case_helpers; protected $test_case_helpers;
protected $fixture_xml_data;
public function __construct($name = NULL, array $data = array(), $dataName = '') public function __construct($name = NULL, array $data = array(), $dataName = '')
{ {
parent::__construct($name, $data, $dataName); parent::__construct($name, $data, $dataName);
@ -32,10 +34,14 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
{ {
parent::setUp(); parent::setUp();
$config = $this->get_database_config(); // Resynchronise tables if a fixture was loaded
$manager = $this->create_connection_manager($config); if (isset($this->fixture_xml_data))
$manager->connect(); {
$manager->post_setup_synchronisation(); $config = $this->get_database_config();
$manager = $this->create_connection_manager($config);
$manager->connect();
$manager->post_setup_synchronisation($this->fixture_xml_data);
}
} }
public function createXMLDataSet($path) public function createXMLDataSet($path)
@ -57,7 +63,9 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
$path = $meta_data['uri']; $path = $meta_data['uri'];
} }
return parent::createXMLDataSet($path); $this->fixture_xml_data = parent::createXMLDataSet($path);
return $this->fixture_xml_data;
} }
public function get_test_case_helpers() public function get_test_case_helpers()

73
tests/test_framework/phpbb_database_test_connection_manager.php
View File

@ -429,12 +429,19 @@ class phpbb_database_test_connection_manager
/** /**
* Performs synchronisations on the database after a fixture has been loaded * Performs synchronisations on the database after a fixture has been loaded
*
* @param PHPUnit_Extensions_Database_DataSet_XmlDataSet $tables Tables contained within the loaded fixture
*
* @return null
*/ */
public function post_setup_synchronisation() public function post_setup_synchronisation($xmlDataSet)
{ {
$this->ensure_connected(__METHOD__); $this->ensure_connected(__METHOD__);
$queries = array(); $queries = array();
// Get escaped versions of the table names used in the fixture
$table_names = array_map(array($this->pdo, 'PDO::quote'), $xmlDataSet->getTableNames());
switch ($this->config['dbms']) switch ($this->config['dbms'])
{ {
case 'oracle': case 'oracle':
@ -445,7 +452,9 @@ class phpbb_database_test_connection_manager
JOIN USER_TRIGGER_COLS tc ON (tc.trigger_name = t.trigger_name) JOIN USER_TRIGGER_COLS tc ON (tc.trigger_name = t.trigger_name)
JOIN USER_SEQUENCES s ON (s.sequence_name = d.referenced_name) JOIN USER_SEQUENCES s ON (s.sequence_name = d.referenced_name)
WHERE d.referenced_type = 'SEQUENCE' WHERE d.referenced_type = 'SEQUENCE'
AND d.type = 'TRIGGER'"; AND d.type = 'TRIGGER'
AND t.table_name IN (" . implode(', ', array_map('strtoupper', $table_names)) . ')';
$result = $this->pdo->query($sql); $result = $this->pdo->query($sql);
while ($row = $result->fetch(PDO::FETCH_ASSOC)) while ($row = $result->fetch(PDO::FETCH_ASSOC))
@ -476,41 +485,43 @@ class phpbb_database_test_connection_manager
break; break;
case 'postgres': case 'postgres':
// First get the sequences // Get the sequences attached to the tables
$sequences = array(); $sql = 'SELECT column_name, table_name FROM information_schema.columns
$sql = "SELECT relname FROM pg_class WHERE relkind = 'S'"; WHERE table_name IN (' . implode(', ', $table_names) . ")
AND strpos(column_default, '_seq''::regclass') > 0";
$result = $this->pdo->query($sql); $result = $this->pdo->query($sql);
$setval_queries = array();
while ($row = $result->fetch(PDO::FETCH_ASSOC)) while ($row = $result->fetch(PDO::FETCH_ASSOC))
{ {
$sequences[] = $row['relname']; // Get the columns used in the fixture for this table
$column_names = $xmlDataSet->getTableMetaData($row['table_name'])->getColumns();
// Skip sequences that weren't specified in the fixture
if (!in_array($row['column_name'], $column_names))
{
continue;
}
// Get the old value if it exists, or use 1 if it doesn't
$sql = "SELECT COALESCE((SELECT MAX({$row['column_name']}) + 1 FROM {$row['table_name']}), 1) AS val";
$result_max = $this->pdo->query($sql);
$row_max = $result_max->fetch(PDO::FETCH_ASSOC);
if ($row_max)
{
$seq_name = $this->pdo->quote($row['table_name'] . '_seq');
$max_val = (int) $row_max['val'];
// The last parameter is false so that the system doesn't increment it again
$setval_queries[] = "SETVAL($seq_name, $max_val, false)";
}
} }
// Now get the name of the column using it // Combine all of the SETVALs into one query
foreach ($sequences as $sequence) if (sizeof($setval_queries))
{ {
$table = str_replace('_seq', '', $sequence); $queries[] = 'SELECT ' . implode(', ', $setval_queries);
$sql = "SELECT column_name FROM information_schema.columns
WHERE table_name = '$table'
AND column_default = 'nextval(''$sequence''::regclass)'";
$result = $this->pdo->query($sql);
$row = $result->fetch(PDO::FETCH_ASSOC);
// Finally, set the new sequence value
if ($row)
{
$column = $row['column_name'];
// Get the old value if it exists, or use 1 if it doesn't
$sql = "SELECT COALESCE((SELECT MAX({$column}) + 1 FROM {$table}), 1) AS val";
$result = $this->pdo->query($sql);
$row = $result->fetch(PDO::FETCH_ASSOC);
if ($row)
{
// The last parameter is false so that the system doesn't increment it again
$queries[] = "SELECT SETVAL('{$sequence}', {$row['val']}, false)";
}
}
} }
break; break;
} }