From ba0282bf38fff65205c23e60a2d2055b9b58913d Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Tue, 10 Jun 2025 10:16:02 +0700
Subject: [PATCH 1/2] [ticket/17524] Add possibility to use index key length in
 migrations

PHPBB-17524
---
 phpBB/phpbb/db/tools/doctrine.php | 51 ++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/phpBB/phpbb/db/tools/doctrine.php b/phpBB/phpbb/db/tools/doctrine.php
index bd3f71f83a..73d47117ce 100644
--- a/phpBB/phpbb/db/tools/doctrine.php
+++ b/phpBB/phpbb/db/tools/doctrine.php
@@ -629,25 +629,16 @@ class doctrine implements tools_interface
 			foreach ($table_data['KEYS'] as $key_name => $key_data)
 			{
 				$columns = (is_array($key_data[1])) ? $key_data[1] : [$key_data[1]];
-
-				// Supports key columns defined with there length
-				$columns = array_map(function (string $column)
-				{
-					if (strpos($column, ':') !== false)
-					{
-						$parts = explode(':', $column, 2);
-						return $parts[0];
-					}
-					return $column;
-				}, $columns);
+				$options = [];
+				$this->schema_get_index_key_data($columns, $options);
 
 				if ($key_data[0] === 'UNIQUE')
 				{
-					$table->addUniqueIndex($columns, $key_name);
+					$table->addUniqueIndex($columns, $key_name, $options);
 				}
 				else
 				{
-					$table->addIndex($columns, $key_name);
+					$table->addIndex($columns, $key_name, [], $options);
 				}
 			}
 		}
@@ -830,7 +821,10 @@ class doctrine implements tools_interface
 			return;
 		}
 
-		$table->addIndex($columns, $index_name);
+		$options = [];
+		$this->schema_get_index_key_data($columns, $options);
+
+		$table->addIndex($columns, $index_name, [], $options);
 	}
 
 	/**
@@ -852,7 +846,10 @@ class doctrine implements tools_interface
 			return;
 		}
 
-		$table->addUniqueIndex($columns, $index_name);
+		$options = [];
+		$this->schema_get_index_key_data($columns, $options);
+
+		$table->addUniqueIndex($columns, $index_name, $options);
 	}
 
 	/**
@@ -891,6 +888,30 @@ class doctrine implements tools_interface
 		$table->setPrimaryKey($columns);
 	}
 
+	/**
+	 * Checks if index data contains key length
+	 * and put it into $options['lengths'] array.
+	 * Handles key length in formats of 'keyname:123' or 'keyname(123)'
+	 *
+	 * @param array  $columns
+	 * @param array  $options
+	 */
+	protected function schema_get_index_key_data(array &$columns, array &$options): void
+	{
+		if (!empty($columns))
+		{
+			$columns = array_map(function (string $column) use (&$options)
+			{
+				if (preg_match('/^([a-zA-Z0-9_]+)(?:(?:\:|\()([0-9]{1,3})\)?)?$/', $column, $parts))
+				{
+					$options['lengths'][] = $parts[2] ?? null;
+					return $parts[1];
+				}
+				return $column;
+			}, $columns);	
+		}			
+	}
+
 	/**
 	 * Recreate an index of a table
 	 *

From af93b1aee997502bae38b2590ecfac5a31d45006 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Tue, 10 Jun 2025 11:31:48 +0700
Subject: [PATCH 2/2] [ticket/17524] Add index data getter to db tools

PHPBB-17524
---
 phpBB/phpbb/db/tools/doctrine.php | 44 +++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/phpBB/phpbb/db/tools/doctrine.php b/phpBB/phpbb/db/tools/doctrine.php
index 73d47117ce..c7616a2a27 100644
--- a/phpBB/phpbb/db/tools/doctrine.php
+++ b/phpBB/phpbb/db/tools/doctrine.php
@@ -378,6 +378,46 @@ class doctrine implements tools_interface
 		}
 	}
 
+	/**
+	 * Returns an array of the table index names and relevant data in format
+	 * [
+	 *		[$index_name] = [
+	 *			'columns'	=> (array) $index_columns,
+	 *			'flags'		=> (array) $index_flags,
+	 *			'options'	=> (array) $index_options,
+	 *			'is_primary'=> (bool) $isPrimary,
+	 *			'is_unique'	=> (bool) $isUnique,
+	 *			'is_simple'	=> (bool) $isSimple,
+	 *		]
+	 *
+	 * @param Schema $schema
+	 * @param string $table_name
+	 * @param string $column_name
+	 * @param array  $column_data
+	 * @param bool   $safe_check
+	 *
+	 * @throws SchemaException
+	 */
+	public function sql_get_table_index_data(string $table_name): array
+	{
+		$schema = $this->get_schema();
+		$table = $schema->getTable($table_name);
+		$indexes = [];
+		foreach ($table->getIndexes() as $index)
+		{
+			$indexes[$index->getName()] = [
+				'columns'	=> array_map('strtolower', $index->getUnquotedColumns()),
+				'flags'		=> $index->getFlags(),
+				'options'	=> $index->getOptions(),
+				'is_primary'=> $index->isPrimary(),
+				'is_unique'	=> $index->isUnique(),
+				'is_simple'	=> $index->isSimpleIndex(),
+			];
+		}
+
+		return $indexes;
+	}
+
 	/**
 	 * Returns an array of indices for either unique and primary keys, or simple indices.
 	 *
@@ -908,8 +948,8 @@ class doctrine implements tools_interface
 					return $parts[1];
 				}
 				return $column;
-			}, $columns);	
-		}			
+			}, $columns);
+		}
 	}
 
 	/**