Merge e5109b66e8 into 4367bc8d11

PHPBB-17507

phpBB/phpbb/db/migration/data/v400/remove_jabber.php

@@ -34,7 +34,15 @@ class remove_jabber extends migration
 				$this->table_prefix . 'users' => [
 					'user_jabber',
 				],
-			]
+			],
+			'add_columns' => [
+				$this->table_prefix . 'user_notifications' => [
+					'id' => ['ULINT', null, 'auto_increment'],
+				],
+			],
+			'add_primary_keys' => [
+				$this->table_prefix . 'user_notifications' => ['id'],
+			],
 		];
 	}
 
@@ -45,7 +53,12 @@ class remove_jabber extends migration
 				$this->table_prefix . 'users' => [
 					'user_jabber' => ['VCHAR_UNI', ''],
 				],
-			]
+			],
+			'drop_columns' => [
+				$this->table_prefix . 'user_notifications' => [
+					'id',
+				],
+			],
 		];
 	}
 
@@ -101,11 +114,26 @@ class remove_jabber extends migration
 		];
 	}
 
-	public function move_jabber_to_email_notifications()
+	public function move_jabber_to_email_notifications(int|null $start)
 	{
-		$sql = 'UPDATE ' . $this->tables['user_notifications'] . '
-			SET ' . $this->db->sql_build_array('UPDATE', ['method' => 'notification.method.email']) . "
-			WHERE method = 'notification.method.jabber'";
-		$this->db->sql_query($sql);
+		$limit = 1000;
+
+		$sql = 'SELECT id FROM ' . $this->tables['user_notifications'] . "
+			WHERE method = 'notification.method.jabber'
+			ORDER BY id ASC";
+		$result = $this->db->sql_query_limit($sql, $limit, $start ?: 0);
+		$rowset = $this->db->sql_fetchrowset($result);
+		$this->db->sql_freeresult($result);
+		$ids_array = array_column($rowset, 'id');
+
+		if (count($ids_array))
+		{
+			$sql = 'UPDATE ' . $this->tables['user_notifications'] . '
+				SET ' . $this->db->sql_build_array('UPDATE', ['method' => 'notification.method.email']) . '
+				WHERE ' . $this->db->sql_in_set('id', $ids_array);
+			$this->db->sql_query($sql);
+		}
+
+		return count($ids_array) < $limit ? true : $start + $limit;
 	}
 }

phpBB/phpbb/db/migration/schema_generator.php

@@ -185,6 +185,7 @@ class schema_generator
 			'drop_columns'		=> 'COLUMNS',
 			'change_columns'	=> 'COLUMNS',
 			'add_index'			=> 'KEYS',
+			'add_primary_keys'	=> 'PRIMARY_KEY',
 			'add_unique_index'	=> 'KEYS',
 			'drop_keys'			=> 'KEYS',
 			'rename_index'		=> 'KEYS',

phpBB/phpbb/db/tools/doctrine.php

@@ -398,7 +398,7 @@ class doctrine implements tools_interface
 		return $this->alter_schema(
 			function (Schema $schema) use ($table_name, $column): void
 			{
-				$this->schema_create_primary_key($schema, $column, $table_name);
+				$this->schema_create_primary_key($schema, $table_name, $column);
 			}
 		);
 	}
@@ -990,16 +990,16 @@ class doctrine implements tools_interface
 	/**
 	 * Creates primary key for a table
 	 *
-	 * @param        $column
 	 * @param Schema $schema
 	 * @param string $table_name
+	 * @param array|string $column_name
 	 * @param bool   $safe_check
 	 *
 	 * @throws SchemaException
 	 */
-	protected function schema_create_primary_key(Schema $schema, $column, string $table_name, bool $safe_check = false): void
+	protected function schema_create_primary_key(Schema $schema, string $table_name, array|string $column_name, bool $safe_check = false): void
 	{
-		$columns = (is_array($column)) ? $column : [$column];
+		$columns = (is_array($column_name)) ? $column_name : [$column_name];
 		$table = $schema->getTable($table_name);
 		$table->dropPrimaryKey();
 		$table->setPrimaryKey($columns);

tests/notification/fixtures/email_notification.type.post.xml

@@ -164,12 +164,14 @@
 		</row>
 	</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></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>2</value>
@@ -177,6 +179,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>3</value>
@@ -184,6 +187,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>4</value>
@@ -191,6 +195,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>5</value>
@@ -198,6 +203,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>6</value>
@@ -205,6 +211,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>7</value>
@@ -212,6 +219,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>8</value>
@@ -219,6 +227,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>2</value>
@@ -226,6 +235,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>3</value>
@@ -233,6 +243,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>4</value>
@@ -240,6 +251,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>5</value>
@@ -247,6 +259,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>6</value>
@@ -254,6 +267,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>7</value>
@@ -261,6 +275,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>8</value>

tests/notification/fixtures/submit_post_notification.type.bookmark.xml

@@ -119,12 +119,14 @@
 		</row>
 	</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></value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>2</value>
@@ -132,6 +134,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>3</value>
@@ -139,6 +142,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>4</value>
@@ -146,6 +150,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>5</value>
@@ -153,6 +158,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>6</value>
@@ -160,6 +166,7 @@
 			<value>0</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>3</value>

tests/notification/fixtures/submit_post_notification.type.forum.xml

@@ -155,12 +155,14 @@
 		</row>
 	</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></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>2</value>
@@ -168,6 +170,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>3</value>
@@ -175,6 +178,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>4</value>
@@ -182,6 +186,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>5</value>
@@ -189,6 +194,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>6</value>
@@ -196,6 +202,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>7</value>
@@ -203,6 +210,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>8</value>
@@ -210,6 +218,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>2</value>
@@ -217,6 +226,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>3</value>
@@ -224,6 +234,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>4</value>
@@ -231,6 +242,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>5</value>
@@ -238,6 +250,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>6</value>
@@ -245,6 +258,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>7</value>
@@ -252,6 +266,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>8</value>

tests/notification/fixtures/submit_post_notification.type.mention.xml

@@ -136,12 +136,14 @@
 		</row>
 	</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></value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>2</value>
@@ -149,6 +151,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>3</value>
@@ -156,6 +159,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>4</value>
@@ -163,6 +167,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>5</value>
@@ -170,6 +175,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>6</value>
@@ -177,6 +183,7 @@
 			<value>0</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>8</value>

tests/notification/fixtures/submit_post_notification.type.post.xml

@@ -155,12 +155,14 @@
 		</row>
 	</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></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>2</value>
@@ -168,6 +170,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>3</value>
@@ -175,6 +178,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>4</value>
@@ -182,6 +186,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>5</value>
@@ -189,6 +194,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>6</value>
@@ -196,6 +202,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>7</value>
@@ -203,6 +210,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>8</value>
@@ -210,6 +218,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>2</value>
@@ -217,6 +226,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>3</value>
@@ -224,6 +234,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>4</value>
@@ -231,6 +242,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>5</value>
@@ -238,6 +250,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>6</value>
@@ -245,6 +258,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>7</value>
@@ -252,6 +266,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>8</value>

tests/notification/fixtures/submit_post_notification.type.post_in_queue.xml

@@ -103,12 +103,14 @@
 		</row>
 	</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></value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>2</value>
@@ -116,6 +118,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>3</value>
@@ -123,6 +126,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>4</value>
@@ -130,6 +134,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>5</value>
@@ -137,6 +142,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>6</value>
@@ -144,6 +150,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>7</value>
@@ -151,6 +158,7 @@
 			<value>0</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>9</value>

tests/notification/fixtures/submit_post_notification.type.quote.xml

@@ -91,12 +91,14 @@
 		</row>
 	</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></value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>2</value>
@@ -104,6 +106,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>3</value>
@@ -111,6 +114,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>4</value>
@@ -118,6 +122,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>5</value>
@@ -125,6 +130,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>6</value>

tests/notification/fixtures/submit_post_notification.type.topic.xml

@@ -99,12 +99,14 @@
 		</row>
 	</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></value>
 			<value>notification.type.topic</value>
 			<value>0</value>
 			<value>2</value>
@@ -112,6 +114,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.topic</value>
 			<value>0</value>
 			<value>6</value>
@@ -119,6 +122,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.topic</value>
 			<value>0</value>
 			<value>7</value>
@@ -126,6 +130,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.topic</value>
 			<value>0</value>
 			<value>8</value>

tests/notification/fixtures/webpush_notification.type.post.xml

@@ -185,12 +185,14 @@
 		</row>
 	</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></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>2</value>
@@ -198,6 +200,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>3</value>
@@ -205,6 +208,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>4</value>
@@ -212,6 +216,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>5</value>
@@ -219,6 +224,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>6</value>
@@ -226,6 +232,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>7</value>
@@ -233,6 +240,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>8</value>
@@ -240,6 +248,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>2</value>
@@ -247,6 +256,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>3</value>
@@ -254,6 +264,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>4</value>
@@ -261,6 +272,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>5</value>
@@ -268,6 +280,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>6</value>
@@ -275,6 +288,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>7</value>
@@ -282,6 +296,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value></value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>8</value>