makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 11:58:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/9687] Adjust queries to be compatible with postgres

Browse source 
PHPBB3-9687
This commit is contained in:
Marc Alexander 2023-07-31 16:41:34 +02:00
parent 0414536727
commit 0be1ffd296
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
5 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions_user.php
View file

@ -750,7 +750,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
// Delete the user_id from the banlist
$sql = 'DELETE FROM ' . BANS_TABLE . '
WHERE ban_mode = \'user\' AND ' . $db->sql_in_set('ban_item', $user_ids);
WHERE ban_mode = \'user\' AND ' . $db->sql_in_set('ban_userid', $user_ids);
$db->sql_query($sql);
// Delete the user_id from the session table

2
phpBB/phpbb/ban/type/base.php
View file

@ -115,7 +115,7 @@ abstract class base implements type_interface
WHERE (ban_end >= ' . time() . "
OR ban_end = 0)
AND ban_mode = '{$this->get_type()}'
ORDER BY ban_item";
ORDER BY ban_item, ban_id";
$result = $this->db->sql_query($sql);
$rowset = $this->db->sql_fetchrowset($result);
$this->db->sql_freeresult($result);

2
phpBB/phpbb/ban/type/user.php
View file

@ -140,7 +140,7 @@ class user extends base
$this->banned_users = [];
while ($row = $this->db->sql_fetchrow($result))
{
$ban_items[] = (int) $row['user_id'];
$ban_items[] = (string) $row['user_id'];
$this->banned_users[(int) $row['user_id']] = $row['username'];
}
$this->db->sql_freeresult($result);

8
tests/ban/ban_manager_test.php
View file

@ -225,9 +225,9 @@ class ban_manager_test extends \phpbb_session_test_case
'email',
[
[
'ban_id' => '9',
'ban_id' => '5',
'ban_userid' => 0,
'ban_item' => '*@foo.bar',
'ban_item' => 'bar@example.org',
'ban_start' => '1111',
'ban_end' => '0',
'ban_reason' => 'HAHAHA',
@ -235,9 +235,9 @@ class ban_manager_test extends \phpbb_session_test_case
'ban_mode' => 'email',
],
[
'ban_id' => '5',
'ban_id' => '9',
'ban_userid' => 0,
'ban_item' => 'bar@example.org',
'ban_item' => '*@foo.bar',
'ban_start' => '1111',
'ban_end' => '0',
'ban_reason' => 'HAHAHA',

4
tests/functions_user/fixtures/delete_user.xml
View file

@ -38,6 +38,7 @@
</table>
<table name="phpbb_bans">
<column>ban_id</column>
<column>ban_userid</column>
<column>ban_mode</column>
<column>ban_item</column>
<column>ban_start</column>
@ -46,6 +47,7 @@
<column>ban_reason_display</column>
<row>
<value>1</value>
<value>2</value>
<value>user</value>
<value>2</value>
<value>0</value>
@ -55,6 +57,7 @@
</row>
<row>
<value>2</value>
<value>3</value>
<value>user</value>
<value>3</value>
<value>0</value>
@ -64,6 +67,7 @@
</row>
<row>
<value>3</value>
<value>0</value>
<value>user</value>
<value>0</value>
<value>0</value>