makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-19 01:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'"
This commit is contained in:
Nils Adermann 2014-10-06 02:08:39 +02:00
commit b354afdeb4
1 changed files with 70 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
phpBB/phpbb/db/migration/data/v310/notifications_use_full_name.php
View file

@ -92,10 +92,41 @@ class notifications_use_full_name extends \phpbb\db\migration\migration
foreach ($this->notification_types as $notification_type) foreach ($this->notification_types as $notification_type)
{ {
$sql = 'UPDATE ' . NOTIFICATION_TYPES_TABLE . " $sql = 'SELECT notification_type_id
SET notification_type_name = 'notification.type.{$notification_type}' FROM ' . NOTIFICATION_TYPES_TABLE . "
WHERE notification_type_name = '{$notification_type}'"; WHERE notification_type_name = 'notification.type.{$notification_type}'";
$this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$new_type_id = (int) $this->db->sql_fetchfield('notification_type_id');
$this->db->sql_freeresult($result);
if ($new_type_id)
{
// New type name already exists,
// so we delete the old type and update the type id of existing entries.
$sql = 'SELECT notification_type_id
FROM ' . NOTIFICATION_TYPES_TABLE . "
WHERE notification_type_name = '{$notification_type}'";
$result = $this->db->sql_query($sql);
$old_type_id = (int) $this->db->sql_fetchfield('notification_type_id');
$this->db->sql_freeresult($result);
$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
SET notification_type_id = ' . (int) $new_type_id . '
WHERE notification_type_id = ' . (int) $old_type_id;
$this->db->sql_query($sql);
$sql = 'DELETE FROM ' . NOTIFICATION_TYPES_TABLE . "
WHERE notification_type_name = '{$notification_type}'";
$this->db->sql_query($sql);
}
else
{
// Otherwise we just update the name
$sql = 'UPDATE ' . NOTIFICATION_TYPES_TABLE . "
SET notification_type_name = 'notification.type.{$notification_type}'
WHERE notification_type_name = '{$notification_type}'";
$this->db->sql_query($sql);
}
$sql = 'UPDATE ' . USER_NOTIFICATIONS_TABLE . " $sql = 'UPDATE ' . USER_NOTIFICATIONS_TABLE . "
SET item_type = 'notification.type.{$notification_type}' SET item_type = 'notification.type.{$notification_type}'
@ -108,10 +139,41 @@ class notifications_use_full_name extends \phpbb\db\migration\migration
{ {
foreach ($this->notification_types as $notification_type) foreach ($this->notification_types as $notification_type)
{ {
$sql = 'UPDATE ' . NOTIFICATION_TYPES_TABLE . " $sql = 'SELECT notification_type_id
SET notification_type_name = '{$notification_type}' FROM ' . NOTIFICATION_TYPES_TABLE . "
WHERE notification_type_name = 'notification.type.{$notification_type}'"; WHERE notification_type_name = '{$notification_type}'";
$this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$new_type_id = (int) $this->db->sql_fetchfield('notification_type_id');
$this->db->sql_freeresult($result);
if ($new_type_id)
{
// New type name already exists,
// so we delete the old type and update the type id of existing entries.
$sql = 'SELECT notification_type_id
FROM ' . NOTIFICATION_TYPES_TABLE . "
WHERE notification_type_name = 'notification.type.{$notification_type}'";
$result = $this->db->sql_query($sql);
$old_type_id = (int) $this->db->sql_fetchfield('notification_type_id');
$this->db->sql_freeresult($result);
$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
SET notification_type_id = ' . (int) $new_type_id . '
WHERE notification_type_id = ' . (int) $old_type_id;
$this->db->sql_query($sql);
$sql = 'DELETE FROM ' . NOTIFICATION_TYPES_TABLE . "
WHERE notification_type_name = 'notification.type.{$notification_type}'";
$this->db->sql_query($sql);
}
else
{
// Otherwise we just update the name
$sql = 'UPDATE ' . NOTIFICATION_TYPES_TABLE . "
SET notification_type_name = '{$notification_type}'
WHERE notification_type_name = 'notification.type.{$notification_type}'";
$this->db->sql_query($sql);
}
$sql = 'UPDATE ' . USER_NOTIFICATIONS_TABLE . " $sql = 'UPDATE ' . USER_NOTIFICATIONS_TABLE . "
SET item_type = '{$notification_type}' SET item_type = '{$notification_type}'