Compare commits

..

2 commits

Author SHA1 Message Date
rxu
ac867d1987
[ticket/17507] Add remove_jabber migration test
PHPBB-17507
2025-07-06 16:35:08 +07:00
rxu
97c8014c64
[ticket/17507] Fix notification related tests
PHPBB-17507
2025-07-06 12:23:05 +07:00
12 changed files with 546 additions and 4 deletions

View file

@ -0,0 +1,284 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dataset>
<table name="phpbb_migrations">
<column>migration_name</column>
<column>migration_depends_on</column>
<column>migration_schema_done</column>
<column>migration_data_done</column>
<column>migration_data_state</column>
<column>migration_start_time</column>
<column>migration_end_time</column>
</table>
<table name="phpbb_config">
<column>config_name</column>
<column>config_value</column>
<row>
<value>jab_enable</value>
<value>1</value>
</row>
<row>
<value>jab_host</value>
<value></value>
</row>
<row>
<value>jab_package_size</value>
<value>0</value>
</row>
<row>
<value>jab_password</value>
<value></value>
</row>
<row>
<value>jab_port</value>
<value></value>
</row>
<row>
<value>jab_use_ssl</value>
<value></value>
</row>
<row>
<value>jab_username</value>
<value>user</value>
</row>
<row>
<value>jab_verify_peer</value>
<value>0</value>
</row>
<row>
<value>jab_verify_peer_name</value>
<value>0</value>
</row>
<row>
<value>jab_allow_self_signed</value>
<value>0</value>
</row>
</table>
<table name="phpbb_modules">
<column>module_id</column>
<column>module_enabled</column>
<column>module_display</column>
<column>module_basename</column>
<column>module_class</column>
<column>parent_id</column>
<column>left_id</column>
<column>right_id</column>
<column>module_langname</column>
<column>module_mode</column>
<column>module_auth</column>
<row>
<value>1</value>
<value>1</value>
<value>1</value>
<value></value>
<value>acp</value>
<value>0</value>
<value>1</value>
<value>76</value>
<value>ACP_CAT_GENERAL</value>
<value></value>
<value></value>
</row>
<row>
<value>4</value>
<value>1</value>
<value>1</value>
<value></value>
<value>acp</value>
<value>0</value>
<value>48</value>
<value>59</value>
<value>ACP_CLIENT_COMMUNICATION</value>
<value></value>
<value></value>
</row>
<row>
<value>75</value>
<value>1</value>
<value>1</value>
<value>acp_jabber</value>
<value>acp</value>
<value>4</value>
<value>53</value>
<value>54</value>
<value>ACP_JABBER_SETTINGS</value>
<value>settings</value>
<value>acl_a_jabber</value>
</row>
</table>
<table name="phpbb_acl_options">
<column>auth_option_id</column>
<column>auth_option</column>
<column>is_global</column>
<column>is_local</column>
<column>founder_only</column>
<row>
<value>70</value>
<value>a_jabber</value>
<value>1</value>
<value>0</value>
<value>0</value>
</row>
<row>
<value>121</value>
<value>u_sendim </value>
<value>1</value>
<value>0</value>
<value>0</value>
</row>
</table>
<table name="phpbb_acl_groups">
<column>group_id</column>
<column>forum_id</column>
<column>auth_option_id</column>
<column>auth_role_id</column>
<column>auth_setting</column>
</table>
<table name="phpbb_acl_roles_data">
<column>role_id</column>
<column>auth_option_id</column>
<column>auth_setting</column>
<row>
<value>4</value>
<value>70</value>
<value>1</value>
</row>
<row>
<value>5</value>
<value>121</value>
<value>1</value>
</row>
<row>
<value>6</value>
<value>121</value>
<value>1</value>
</row>
</table>
<table name="phpbb_acl_users">
<column>user_id</column>
<column>forum_id</column>
<column>auth_option_id</column>
<column>auth_role_id</column>
<column>auth_setting</column>
</table>
<table name="phpbb_user_notifications">
<column>id</column>
<column>item_type</column>
<column>item_id</column>
<column>user_id</column>
<column>method</column>
<column>notify</column>
<row>
<value>1</value>
<value>notification.type.post</value>
<value>0</value>
<value>2</value>
<value>notification.method.jabber</value>
<value>1</value>
</row>
<row>
<value>2</value>
<value>notification.type.post</value>
<value>0</value>
<value>3</value>
<value>notification.method.jabber</value>
<value>1</value>
</row>
<row>
<value>3</value>
<value>notification.type.post</value>
<value>0</value>
<value>4</value>
<value>notification.method.jabber</value>
<value>1</value>
</row>
<row>
<value>4</value>
<value>notification.type.post</value>
<value>0</value>
<value>5</value>
<value>notification.method.jabber</value>
<value>1</value>
</row>
<row>
<value>5</value>
<value>notification.type.post</value>
<value>0</value>
<value>6</value>
<value>notification.method.jabber</value>
<value>1</value>
</row>
<row>
<value>6</value>
<value>notification.type.post</value>
<value>0</value>
<value>7</value>
<value>notification.method.jabber</value>
<value>1</value>
</row>
<row>
<value>7</value>
<value>notification.type.post</value>
<value>0</value>
<value>8</value>
<value>notification.method.jabber</value>
<value>1</value>
</row>
<row>
<value>8</value>
<value>notification.type.forum</value>
<value>0</value>
<value>2</value>
<value>notification.method.jabber</value>
<value>1</value>
</row>
<row>
<value>9</value>
<value>notification.type.forum</value>
<value>0</value>
<value>3</value>
<value>notification.method.jabber</value>
<value>1</value>
</row>
<row>
<value>10</value>
<value>notification.type.forum</value>
<value>0</value>
<value>4</value>
<value>notification.method.jabber</value>
<value>1</value>
</row>
<row>
<value>11</value>
<value>notification.type.forum</value>
<value>0</value>
<value>5</value>
<value>notification.method.jabber</value>
<value>1</value>
</row>
<row>
<value>12</value>
<value>notification.type.forum</value>
<value>0</value>
<value>6</value>
<value>notification.method.jabber</value>
<value>1</value>
</row>
<row>
<value>13</value>
<value>notification.type.forum</value>
<value>0</value>
<value>7</value>
<value>notification.method.jabber</value>
<value>1</value>
</row>
<row>
<value>14</value>
<value>notification.type.forum</value>
<value>0</value>
<value>8</value>
<value>notification.method.jabber</value>
<value>1</value>
</row>
</table>
</dataset>

View file

@ -0,0 +1,169 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
class phpbb_migrations_remove_jabber_migration_test extends phpbb_database_test_case
{
/** @var \phpbb\db\driver\driver_interface */
protected $db;
/** @var \Doctrine\DBAL\Connection */
protected $doctrine_db;
/** @var \phpbb\db\tools\tools_interface */
protected $db_tools;
/** @var \phpbb\db\migrator */
protected $migrator;
/** @var \phpbb\config\config */
protected $config;
/** @var \phpbb\extension\manager */
protected $extension_manager;
public function getDataSet()
{
return $this->createXMLDataSet(__DIR__.'/fixtures/migration_remove_jabber.xml');
}
protected function setUp(): void
{
global $cache, $db, $phpbb_log, $phpbb_root_path, $phpEx, $skip_add_log, $table_prefix, $user;
parent::setUp();
// Disable the logs
$skip_add_log = true;
$db = $this->db = $this->new_dbal();
$this->doctrine_db = $this->new_doctrine_dbal();
$factory = new \phpbb\db\tools\factory();
$this->db_tools = $factory->get($this->doctrine_db);
$this->db_tools->set_table_prefix($table_prefix);
$this->cache = new phpbb_mock_cache();
$this->auth = new \phpbb\auth\auth();
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$cache = $this->cache_service = new \phpbb\cache\service(new \phpbb\cache\driver\dummy(), new \phpbb\config\config(array()), $this->db, $phpbb_dispatcher, $phpbb_root_path, $phpEx);
$this->config = new \phpbb\config\db($this->db, $this->cache, 'phpbb_config');
$this->config->initialise($this->cache);
$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
$lang = new \phpbb\language\language($lang_loader);
$user = $this->user = new \phpbb\user($lang, '\phpbb\datetime');
$phpbb_log = new \phpbb\log\log($this->db, $this->user, $this->auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
$container = new phpbb_mock_container_builder();
$container->set('event_dispatcher', $phpbb_dispatcher);
$finder_factory = $this->createMock('\phpbb\finder\factory');
$this->extension_manager = new \phpbb\extension\manager(
$container,
$this->db,
$this->config,
$finder_factory,
'phpbb_ext',
__DIR__ . '/../../phpBB/',
null
);
$module_manager = new \phpbb\module\module_manager($this->cache, $this->db, $this->extension_manager, 'phpbb_modules', $phpbb_root_path, $phpEx);
$tools = array(
new \phpbb\db\migration\tool\config($this->config),
new \phpbb\db\migration\tool\module($this->db, $this->user, $module_manager, 'phpbb_modules'),
new \phpbb\db\migration\tool\permission($this->db, $this->cache_service, $this->auth, $phpbb_root_path, $phpEx),
);
$this->migrator = new \phpbb\db\migrator(
$container,
$this->config,
$this->db,
$this->db_tools,
'phpbb_migrations',
__DIR__ . '/../../phpBB/',
'php',
'phpbb_',
self::get_core_tables(),
$tools,
new \phpbb\db\migration\helper()
);
$container->set('migrator', $this->migrator);
}
public function test_remove_jabber_migration()
{
$sql = "SELECT id FROM phpbb_user_notifications
WHERE method = 'notification.method.jabber'";
$result = $this->db->sql_query($sql);
$rowset = $this->db->sql_fetchrowset($result);
$this->db->sql_freeresult($result);
$this->assertEquals(14, count($rowset));
$sql = "SELECT config_name FROM phpbb_config
WHERE config_name = 'jab_enable'";
$this->assertNotFalse($this->db->sql_query($sql));
$sql = "SELECT auth_option FROM phpbb_acl_options
WHERE auth_option = 'a_jabber'";
$this->assertNotFalse($this->db->sql_query($sql));
$this->migrator->set_migrations(['\phpbb\db\migration\data\v400\remove_jabber']);
while (!$this->migrator->finished())
{
try
{
$this->migrator->update();
}
catch (\phpbb\db\migration\exception $e)
{
$this->fail($e->__toString());
}
}
$sql = "SELECT id FROM phpbb_user_notifications
WHERE method = 'notification.method.jabber'";
$this->assertFalse($this->db->sql_query($sql));
$sql = "SELECT id FROM phpbb_user_notifications
WHERE method = 'notification.method.email'";
$result = $this->db->sql_query($sql);
$rowset = $this->db->sql_fetchrowset($result);
$this->db->sql_freeresult($result);
$this->assertEquals(14, count($rowset));
$sql = "SELECT config_name FROM phpbb_config
WHERE config_name = 'jab_enable'";
$this->assertFalse($this->db->sql_query($sql));
$sql = "SELECT auth_option FROM phpbb_acl_options
WHERE auth_option = 'a_jabber'";
$this->assertFalse($this->db->sql_query($sql));
while ($this->migrator->migration_state('phpbb_dbal_migration_schema_index'))
{
$this->migrator->revert('phpbb_dbal_migration_schema_index');
}
$sql = "SELECT config_name FROM phpbb_config
WHERE config_name = 'jab_enable'";
$this->assertNotFalse($this->db->sql_query($sql));
$sql = "SELECT auth_option FROM phpbb_acl_options
WHERE auth_option = 'a_jabber'";
$this->assertNotFalse($this->db->sql_query($sql));
}
}

View file

@ -164,12 +164,14 @@
</row> </row>
</table> </table>
<table name="phpbb_user_notifications"> <table name="phpbb_user_notifications">
<column>id</column>
<column>item_type</column> <column>item_type</column>
<column>item_id</column> <column>item_id</column>
<column>user_id</column> <column>user_id</column>
<column>method</column> <column>method</column>
<column>notify</column> <column>notify</column>
<row> <row>
<value>1</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>2</value> <value>2</value>
@ -177,6 +179,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>2</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>3</value> <value>3</value>
@ -184,6 +187,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>3</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>4</value> <value>4</value>
@ -191,6 +195,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>4</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>5</value> <value>5</value>
@ -198,6 +203,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>5</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>6</value> <value>6</value>
@ -205,6 +211,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>6</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>7</value> <value>7</value>
@ -212,6 +219,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>7</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>8</value> <value>8</value>
@ -219,6 +227,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>8</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>2</value> <value>2</value>
@ -226,6 +235,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>9</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>3</value> <value>3</value>
@ -233,6 +243,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>10</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>4</value> <value>4</value>
@ -240,6 +251,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>11</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>5</value> <value>5</value>
@ -247,6 +259,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>12</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>6</value> <value>6</value>
@ -254,6 +267,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>13</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>7</value> <value>7</value>
@ -261,6 +275,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>14</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>8</value> <value>8</value>

View file

@ -119,12 +119,14 @@
</row> </row>
</table> </table>
<table name="phpbb_user_notifications"> <table name="phpbb_user_notifications">
<column>id</column>
<column>item_type</column> <column>item_type</column>
<column>item_id</column> <column>item_id</column>
<column>user_id</column> <column>user_id</column>
<column>method</column> <column>method</column>
<column>notify</column> <column>notify</column>
<row> <row>
<value>1</value>
<value>notification.type.bookmark</value> <value>notification.type.bookmark</value>
<value>0</value> <value>0</value>
<value>2</value> <value>2</value>
@ -132,6 +134,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>2</value>
<value>notification.type.bookmark</value> <value>notification.type.bookmark</value>
<value>0</value> <value>0</value>
<value>3</value> <value>3</value>
@ -139,6 +142,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>3</value>
<value>notification.type.bookmark</value> <value>notification.type.bookmark</value>
<value>0</value> <value>0</value>
<value>4</value> <value>4</value>
@ -146,6 +150,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>4</value>
<value>notification.type.bookmark</value> <value>notification.type.bookmark</value>
<value>0</value> <value>0</value>
<value>5</value> <value>5</value>
@ -153,6 +158,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>5</value>
<value>notification.type.bookmark</value> <value>notification.type.bookmark</value>
<value>0</value> <value>0</value>
<value>6</value> <value>6</value>
@ -160,6 +166,7 @@
<value>0</value> <value>0</value>
</row> </row>
<row> <row>
<value>6</value>
<value>notification.type.bookmark</value> <value>notification.type.bookmark</value>
<value>0</value> <value>0</value>
<value>3</value> <value>3</value>

View file

@ -155,12 +155,14 @@
</row> </row>
</table> </table>
<table name="phpbb_user_notifications"> <table name="phpbb_user_notifications">
<column>id</column>
<column>item_type</column> <column>item_type</column>
<column>item_id</column> <column>item_id</column>
<column>user_id</column> <column>user_id</column>
<column>method</column> <column>method</column>
<column>notify</column> <column>notify</column>
<row> <row>
<value>1</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>2</value> <value>2</value>
@ -168,6 +170,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>2</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>3</value> <value>3</value>
@ -175,6 +178,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>3</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>4</value> <value>4</value>
@ -182,6 +186,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>4</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>5</value> <value>5</value>
@ -189,6 +194,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>5</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>6</value> <value>6</value>
@ -196,6 +202,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>6</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>7</value> <value>7</value>
@ -203,6 +210,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>7</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>8</value> <value>8</value>
@ -210,6 +218,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>8</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>2</value> <value>2</value>
@ -217,6 +226,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>9</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>3</value> <value>3</value>
@ -224,6 +234,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>10</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>4</value> <value>4</value>
@ -231,6 +242,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>11</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>5</value> <value>5</value>
@ -238,6 +250,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>12</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>6</value> <value>6</value>
@ -245,6 +258,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>13</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>7</value> <value>7</value>
@ -252,6 +266,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>14</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>8</value> <value>8</value>

View file

@ -136,12 +136,14 @@
</row> </row>
</table> </table>
<table name="phpbb_user_notifications"> <table name="phpbb_user_notifications">
<column>id</column>
<column>item_type</column> <column>item_type</column>
<column>item_id</column> <column>item_id</column>
<column>user_id</column> <column>user_id</column>
<column>method</column> <column>method</column>
<column>notify</column> <column>notify</column>
<row> <row>
<value>1</value>
<value>notification.type.mention</value> <value>notification.type.mention</value>
<value>0</value> <value>0</value>
<value>2</value> <value>2</value>
@ -149,6 +151,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>2</value>
<value>notification.type.mention</value> <value>notification.type.mention</value>
<value>0</value> <value>0</value>
<value>3</value> <value>3</value>
@ -156,6 +159,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>3</value>
<value>notification.type.mention</value> <value>notification.type.mention</value>
<value>0</value> <value>0</value>
<value>4</value> <value>4</value>
@ -163,6 +167,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>4</value>
<value>notification.type.mention</value> <value>notification.type.mention</value>
<value>0</value> <value>0</value>
<value>5</value> <value>5</value>
@ -170,6 +175,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>5</value>
<value>notification.type.mention</value> <value>notification.type.mention</value>
<value>0</value> <value>0</value>
<value>6</value> <value>6</value>
@ -177,6 +183,7 @@
<value>0</value> <value>0</value>
</row> </row>
<row> <row>
<value>6</value>
<value>notification.type.mention</value> <value>notification.type.mention</value>
<value>0</value> <value>0</value>
<value>8</value> <value>8</value>

View file

@ -155,12 +155,14 @@
</row> </row>
</table> </table>
<table name="phpbb_user_notifications"> <table name="phpbb_user_notifications">
<column>id</column>
<column>item_type</column> <column>item_type</column>
<column>item_id</column> <column>item_id</column>
<column>user_id</column> <column>user_id</column>
<column>method</column> <column>method</column>
<column>notify</column> <column>notify</column>
<row> <row>
<value>1</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>2</value> <value>2</value>
@ -168,6 +170,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>2</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>3</value> <value>3</value>
@ -175,6 +178,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>3</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>4</value> <value>4</value>
@ -182,6 +186,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>4</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>5</value> <value>5</value>
@ -189,6 +194,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>5</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>6</value> <value>6</value>
@ -196,6 +202,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>6</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>7</value> <value>7</value>
@ -203,6 +210,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>7</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>8</value> <value>8</value>
@ -210,6 +218,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>8</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>2</value> <value>2</value>
@ -217,6 +226,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>9</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>3</value> <value>3</value>
@ -224,6 +234,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>10</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>4</value> <value>4</value>
@ -231,6 +242,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>11</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>5</value> <value>5</value>
@ -238,6 +250,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>12</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>6</value> <value>6</value>
@ -245,6 +258,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>13</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>7</value> <value>7</value>
@ -252,6 +266,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>14</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>8</value> <value>8</value>

View file

@ -103,12 +103,14 @@
</row> </row>
</table> </table>
<table name="phpbb_user_notifications"> <table name="phpbb_user_notifications">
<column>id</column>
<column>item_type</column> <column>item_type</column>
<column>item_id</column> <column>item_id</column>
<column>user_id</column> <column>user_id</column>
<column>method</column> <column>method</column>
<column>notify</column> <column>notify</column>
<row> <row>
<value>1</value>
<value>notification.type.needs_approval</value> <value>notification.type.needs_approval</value>
<value>0</value> <value>0</value>
<value>2</value> <value>2</value>
@ -116,6 +118,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>2</value>
<value>notification.type.needs_approval</value> <value>notification.type.needs_approval</value>
<value>0</value> <value>0</value>
<value>3</value> <value>3</value>
@ -123,6 +126,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>3</value>
<value>notification.type.needs_approval</value> <value>notification.type.needs_approval</value>
<value>0</value> <value>0</value>
<value>4</value> <value>4</value>
@ -130,6 +134,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>4</value>
<value>notification.type.needs_approval</value> <value>notification.type.needs_approval</value>
<value>0</value> <value>0</value>
<value>5</value> <value>5</value>
@ -137,6 +142,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>5</value>
<value>notification.type.needs_approval</value> <value>notification.type.needs_approval</value>
<value>0</value> <value>0</value>
<value>6</value> <value>6</value>
@ -144,6 +150,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>6</value>
<value>notification.type.needs_approval</value> <value>notification.type.needs_approval</value>
<value>0</value> <value>0</value>
<value>7</value> <value>7</value>
@ -151,6 +158,7 @@
<value>0</value> <value>0</value>
</row> </row>
<row> <row>
<value>7</value>
<value>notification.type.needs_approval</value> <value>notification.type.needs_approval</value>
<value>0</value> <value>0</value>
<value>9</value> <value>9</value>

View file

@ -91,12 +91,14 @@
</row> </row>
</table> </table>
<table name="phpbb_user_notifications"> <table name="phpbb_user_notifications">
<column>id</column>
<column>item_type</column> <column>item_type</column>
<column>item_id</column> <column>item_id</column>
<column>user_id</column> <column>user_id</column>
<column>method</column> <column>method</column>
<column>notify</column> <column>notify</column>
<row> <row>
<value>1</value>
<value>notification.type.quote</value> <value>notification.type.quote</value>
<value>0</value> <value>0</value>
<value>2</value> <value>2</value>
@ -104,6 +106,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>2</value>
<value>notification.type.quote</value> <value>notification.type.quote</value>
<value>0</value> <value>0</value>
<value>3</value> <value>3</value>
@ -111,6 +114,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>3</value>
<value>notification.type.quote</value> <value>notification.type.quote</value>
<value>0</value> <value>0</value>
<value>4</value> <value>4</value>
@ -118,6 +122,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>4</value>
<value>notification.type.quote</value> <value>notification.type.quote</value>
<value>0</value> <value>0</value>
<value>5</value> <value>5</value>
@ -125,6 +130,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>5</value>
<value>notification.type.quote</value> <value>notification.type.quote</value>
<value>0</value> <value>0</value>
<value>6</value> <value>6</value>

View file

@ -99,12 +99,14 @@
</row> </row>
</table> </table>
<table name="phpbb_user_notifications"> <table name="phpbb_user_notifications">
<column>id</column>
<column>item_type</column> <column>item_type</column>
<column>item_id</column> <column>item_id</column>
<column>user_id</column> <column>user_id</column>
<column>method</column> <column>method</column>
<column>notify</column> <column>notify</column>
<row> <row>
<value>1</value>
<value>notification.type.topic</value> <value>notification.type.topic</value>
<value>0</value> <value>0</value>
<value>2</value> <value>2</value>
@ -112,6 +114,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>2</value>
<value>notification.type.topic</value> <value>notification.type.topic</value>
<value>0</value> <value>0</value>
<value>6</value> <value>6</value>
@ -119,6 +122,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>3</value>
<value>notification.type.topic</value> <value>notification.type.topic</value>
<value>0</value> <value>0</value>
<value>7</value> <value>7</value>
@ -126,6 +130,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>4</value>
<value>notification.type.topic</value> <value>notification.type.topic</value>
<value>0</value> <value>0</value>
<value>8</value> <value>8</value>

View file

@ -185,12 +185,14 @@
</row> </row>
</table> </table>
<table name="phpbb_user_notifications"> <table name="phpbb_user_notifications">
<column>id</column>
<column>item_type</column> <column>item_type</column>
<column>item_id</column> <column>item_id</column>
<column>user_id</column> <column>user_id</column>
<column>method</column> <column>method</column>
<column>notify</column> <column>notify</column>
<row> <row>
<value>1</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>2</value> <value>2</value>
@ -198,6 +200,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>2</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>3</value> <value>3</value>
@ -205,6 +208,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>3</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>4</value> <value>4</value>
@ -212,6 +216,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>4</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>5</value> <value>5</value>
@ -219,6 +224,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>5</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>6</value> <value>6</value>
@ -226,6 +232,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>6</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>7</value> <value>7</value>
@ -233,6 +240,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>7</value>
<value>notification.type.post</value> <value>notification.type.post</value>
<value>0</value> <value>0</value>
<value>8</value> <value>8</value>
@ -240,6 +248,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>8</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>2</value> <value>2</value>
@ -247,6 +256,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>9</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>3</value> <value>3</value>
@ -254,6 +264,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>10</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>4</value> <value>4</value>
@ -261,6 +272,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>11</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>5</value> <value>5</value>
@ -268,6 +280,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>12</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>6</value> <value>6</value>
@ -275,6 +288,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>13</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>7</value> <value>7</value>
@ -282,6 +296,7 @@
<value>1</value> <value>1</value>
</row> </row>
<row> <row>
<value>14</value>
<value>notification.type.forum</value> <value>notification.type.forum</value>
<value>0</value> <value>0</value>
<value>8</value> <value>8</value>

View file

@ -213,10 +213,6 @@ abstract class phpbb_database_test_case extends TestCase
if ($has_default_identity || $add_primary_keys) if ($has_default_identity || $add_primary_keys)
{ {
// Enable implicit identity insert on mssql
$sql = "SET IDENTITY_INSERT $key OFF";
$db->sql_query($sql);
// Add default identity column to columns list // Add default identity column to columns list
if ($has_default_identity) if ($has_default_identity)
{ {