mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 07:35:29 +02:00
Code Issues Releases Wiki Activity

Merge branch 'exreaction/ticket/11881' into develop-ascraeus

Browse Source 
* exreaction/ticket/11881:
  [ticket/11881] Move convert_timezones_test to migrator
  [ticket/11881] Fix test filename
  [ticket/11881] Limit to 500
  [ticket/11881] Make sure user_timezone isn't converted twice
  [ticket/11881] Better split the timezone conversion into chunks; add test
  [ticket/11881] Timezone migration can take a long time
This commit is contained in:
Nils Adermann 2014-05-02 14:46:25 +02:00
commit 4f17d0653a
3 changed files with 210 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
phpBB/phpbb/db/migration/data/v310/timezone.php
View File

@ -39,24 +39,49 @@ class timezone extends \phpbb\db\migration\migration
);
}
public function update_timezones()
public function update_timezones($start)
{
// Update user timezones
$sql = 'SELECT user_dst, user_timezone
FROM ' . $this->table_prefix . 'users
GROUP BY user_timezone, user_dst';
$result = $this->db->sql_query($sql);
$start = (int) $start;
$limit = 500;
$converted = 0;
$update_blocks = array();
$sql = 'SELECT user_id, user_timezone, user_dst
FROM ' . $this->table_prefix . 'users
ORDER BY user_id ASC';
$result = $this->db->sql_query_limit($sql, $limit, $start);
while ($row = $this->db->sql_fetchrow($result))
{
$sql = 'UPDATE ' . $this->table_prefix . "users
SET user_timezone = '" . $this->db->sql_escape($this->convert_phpbb30_timezone($row['user_timezone'], $row['user_dst'])) . "'
WHERE user_timezone = '" . $this->db->sql_escape($row['user_timezone']) . "'
AND user_dst = " . (int) $row['user_dst'];
$this->sql_query($sql);
$converted++;
// In case this is somehow run twice on a row.
// Otherwise it would just end up as UTC on the second run
if (is_numeric($row['user_timezone']))
{
$update_blocks[$row['user_timezone'] . ':' . $row['user_dst']][] = (int) $row['user_id'];
}
}
$this->db->sql_freeresult($result);
// Update blocks of users who share the same timezone/dst
foreach ($update_blocks as $timezone => $user_ids)
{
$timezone = explode(':', $timezone);
$converted_timezone = $this->convert_phpbb30_timezone($timezone[0], $timezone[1]);
$sql = 'UPDATE ' . $this->table_prefix . "users
SET user_timezone = '" . $this->db->sql_escape($converted_timezone) . "'
WHERE " . $this->db->sql_in_set('user_id', $user_ids);
$this->sql_query($sql);
}
if ($converted == $limit)
{
// There are still more to convert
return $start + $limit;
}
// Update board default timezone
$sql = 'UPDATE ' . $this->table_prefix . "config
SET config_value = '" . $this->convert_phpbb30_timezone($this->config['board_timezone'], $this->config['board_dst']) . "'

94
tests/migrator/convert_timezones_test.php Normal file
View File

@ -0,0 +1,94 @@
<?php
/**
*
* @package testing
* @copyright (c) 2013 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
class phpbb_migrator_convert_timezones_test extends phpbb_database_test_case
{
protected $notifications, $db, $container, $user, $config, $auth, $cache;
public function getDataSet()
{
$this->db = $this->new_dbal();
$db_tools = new \phpbb\db\tools($this->db);
// user_dst doesn't exist anymore, must re-add it to test this
$db_tools->sql_column_add('phpbb_users', 'user_dst', array('BOOL', 1));
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/convert_timezones.xml');
}
public function revert_schema()
{
return array(
'drop_columns' => array(
$this->table_prefix . 'users' => array(
'user_dst',
),
),
);
}
public function update_schema()
{
return array(
'add_columns' => array(
$this->table_prefix . 'users' => array(
'user_dst' => array('BOOL', 0),
),
),
);
}
protected function setUp()
{
parent::setUp();
global $phpbb_root_path, $phpEx;
$this->db = $this->new_dbal();
$this->migration = new \phpbb\db\migration\data\v310\timezone(
new \phpbb\config\config(array()),
$this->db,
new \phpbb\db\tools($this->db),
$phpbb_root_path,
$phpEx,
'phpbb_'
);
}
protected $expected_results = array(
//user_id => user_timezone
1 => 'Etc/GMT+12',
2 => 'Etc/GMT+11',
3 => 'Etc/GMT-3',
4 => 'Etc/GMT-4',
5 => 'America/St_Johns',
6 => 'Australia/Eucla',
);
public function test_convert()
{
$this->migration->update_timezones(0);
$sql = 'SELECT user_id, user_timezone
FROM phpbb_users
ORDER BY user_id ASC';
$result = $this->db->sql_query($sql);
while ($row = $this->db->sql_fetchrow($result))
{
$this->assertEquals($this->expected_results[$row['user_id']], $row['user_timezone']);
}
$this->db->sql_freeresult($result);
$db_tools = new \phpbb\db\tools($this->db);
// Remove the user_dst field again
$db_tools->sql_column_remove('phpbb_users', 'user_dst');
}
}

80
tests/migrator/fixtures/convert_timezones.xml Normal file
View File

@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dataset>
<table name="phpbb_users">
<column>user_id</column>
<column>username</column>
<column>username_clean</column>
<column>user_permissions</column>
<column>user_sig</column>
<column>user_occ</column>
<column>user_interests</column>
<column>user_timezone</column>
<column>user_dst</column>
<row>
<value>1</value>
<value>1</value>
<value>1</value>
<value></value>
<value></value>
<value></value>
<value></value>
<value>-12</value>
<value>0</value>
</row>
<row>
<value>2</value>
<value>2</value>
<value>2</value>
<value></value>
<value></value>
<value></value>
<value></value>
<value>-12</value>
<value>1</value>
</row>
<row>
<value>3</value>
<value>3</value>
<value>3</value>
<value></value>
<value></value>
<value></value>
<value></value>
<value>3</value>
<value>0</value>
</row>
<row>
<value>4</value>
<value>4</value>
<value>4</value>
<value></value>
<value></value>
<value></value>
<value></value>
<value>3</value>
<value>1</value>
</row>
<row>
<value>5</value>
<value>5</value>
<value>5</value>
<value></value>
<value></value>
<value></value>
<value></value>
<value>-3.5</value>
<value>0</value>
</row>
<row>
<value>6</value>
<value>6</value>
<value>6</value>
<value></value>
<value></value>
<value></value>
<value></value>
<value>8.75</value>
<value>0</value>
</row>
</table>
</dataset>