8 files changed, 31 insertions, 9 deletions
diff --git a/phpBB/phpbb/db/driver/mssqlnative.php b/phpBB/phpbb/db/driver/mssqlnative.php
index 9639bfa988..a7f93c8feb 100644
--- a/phpBB/phpbb/db/driver/mssqlnative.php
+++ b/phpBB/phpbb/db/driver/mssqlnative.php
@@ -319,10 +319,10 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
 			{
 				foreach ($errors as $error)
 				{
-					$error_message .= "SQLSTATE: " . $error[ 'SQLSTATE'] . "\n";
-					$error_message .= "code: " . $error[ 'code'] . "\n";
+					$error_message .= "SQLSTATE: " . $error['SQLSTATE'] . "\n";
+					$error_message .= "code: " . $error['code'] . "\n";
 					$code = $error['code'];
-					$error_message .= "message: " . $error[ 'message'] . "\n";
+					$error_message .= "message: " . $error['message'] . "\n";
 				}
 				$this->last_error_result = $error_message;
 				$error = $this->last_error_result;
diff --git a/phpBB/phpbb/db/migration/data/v310/passwords_convert_p1.php b/phpBB/phpbb/db/migration/data/v310/passwords_convert_p1.php
index 004d94d8bd..aad8e44681 100644
--- a/phpBB/phpbb/db/migration/data/v310/passwords_convert_p1.php
+++ b/phpBB/phpbb/db/migration/data/v310/passwords_convert_p1.php
@@ -42,7 +42,6 @@ class passwords_convert_p1 extends \phpbb\db\migration\migration
 		$sql = 'SELECT user_password, user_id
 			FROM ' . $this->table_prefix . 'users
 			WHERE user_pass_convert = 1
-			GROUP BY user_id
 			ORDER BY user_id';
 		$result = $this->db->sql_query_limit($sql, $limit, $start);
 
diff --git a/phpBB/phpbb/db/migration/schema_generator.php b/phpBB/phpbb/db/migration/schema_generator.php
index 818e27a362..91d8307d91 100644
--- a/phpBB/phpbb/db/migration/schema_generator.php
+++ b/phpBB/phpbb/db/migration/schema_generator.php
@@ -217,7 +217,7 @@ class schema_generator
 	* Check if one of the migrations files' dependencies can't be resolved
 	* by the supplied list of migrations
 	*
-	* @throws UnexpectedValueException If a dependency can't be resolved
+	* @throws \UnexpectedValueException If a dependency can't be resolved
 	*/
 	protected function check_dependencies()
 	{
diff --git a/phpBB/phpbb/db/migration/tool/config.php b/phpBB/phpbb/db/migration/tool/config.php
index 1027b425ff..f93e7118c4 100644
--- a/phpBB/phpbb/db/migration/tool/config.php
+++ b/phpBB/phpbb/db/migration/tool/config.php
@@ -66,6 +66,7 @@ class config implements \phpbb\db\migration\tool\tool_interface
 	* 	like to update
 	* @param mixed $config_value The value of the config setting
 	* @return null
+	* @throws \phpbb\db\migration\exception
 	*/
 	public function update($config_name, $config_value)
 	{
@@ -87,6 +88,7 @@ class config implements \phpbb\db\migration\tool\tool_interface
 	* 	like to update
 	* @param mixed $config_value The value of the config setting
 	* @return null
+	* @throws \phpbb\db\migration\exception
 	*/
 	public function update_if_equals($compare, $config_name, $config_value)
 	{
diff --git a/phpBB/phpbb/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php
index 17deb1b19c..db43046a95 100644
--- a/phpBB/phpbb/db/migration/tool/module.php
+++ b/phpBB/phpbb/db/migration/tool/module.php
@@ -167,6 +167,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
 	* 			modules in that info file.
 	* 	path, specify that here
 	* @return null
+	* @throws \phpbb\db\migration\exception
 	*/
 	public function add($class, $parent = 0, $data = array())
 	{
@@ -331,6 +332,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
 	* @param int|string $module The module id|module_langname
 	* 	specify that here
 	* @return null
+	* @throws \phpbb\db\migration\exception
 	*/
 	public function remove($class, $parent = 0, $module = '')
 	{
@@ -466,6 +468,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
 	* @param string $class Module Class
 	* @param string $basename Module Basename
 	* @return array Module Information
+	* @throws \phpbb\db\migration\exception
 	*/
 	protected function get_module_info($class, $basename)
 	{
diff --git a/phpBB/phpbb/db/migration/tool/permission.php b/phpBB/phpbb/db/migration/tool/permission.php
index ba856fbeda..d2df27613a 100644
--- a/phpBB/phpbb/db/migration/tool/permission.php
+++ b/phpBB/phpbb/db/migration/tool/permission.php
@@ -283,6 +283,7 @@ class permission implements \phpbb\db\migration\tool\tool_interface
 	* @param string $old_role_name The old role name
 	* @param string $new_role_name The new role name
 	* @return null
+	* @throws \phpbb\db\migration\exception
 	*/
 	public function role_update($old_role_name, $new_role_name)
 	{
@@ -345,6 +346,7 @@ class permission implements \phpbb\db\migration\tool\tool_interface
 	* @param bool $has_permission True if you want to give them permission,
 	* 	false if you want to deny them permission
 	* @return null
+	* @throws \phpbb\db\migration\exception
 	*/
 	public function permission_set($name, $auth_option, $type = 'role', $has_permission = true)
 	{
@@ -490,6 +492,7 @@ class permission implements \phpbb\db\migration\tool\tool_interface
 	* 	auth_options you would like to set
 	* @param string $type The type (role|group)
 	* @return null
+	* @throws \phpbb\db\migration\exception
 	*/
 	public function permission_unset($name, $auth_option, $type = 'role')
 	{
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php
index 5255c73c1c..c2f7b5ab23 100644
--- a/phpBB/phpbb/db/migrator.php
+++ b/phpBB/phpbb/db/migrator.php
@@ -167,8 +167,9 @@ class migrator
 	/**
 	* Attempts to apply a step of the given migration or one of its dependencies
 	*
-	* @param	string	The class name of the migration
+	* @param	string	$name The class name of the migration
 	* @return	bool	Whether any update step was successfully run
+	* @throws \phpbb\db\migration\exception
 	*/
 	protected function try_apply($name)
 	{
@@ -302,7 +303,7 @@ class migrator
 	/**
 	* Attempts to revert a step of the given migration or one of its dependencies
 	*
-	* @param	string	The class name of the migration
+	* @param	string	$name The class name of the migration
 	* @return	bool	Whether any update step was successfully run
 	*/
 	protected function try_revert($name)
@@ -368,6 +369,7 @@ class migrator
 	* @param bool|string $state Current state of the migration
 	* @param bool $revert true to revert a data step
 	* @return bool|string migration state. True if completed, serialized array if not finished
+	* @throws \phpbb\db\migration\exception
 	*/
 	protected function process_data_step($steps, $state, $revert = false)
 	{
@@ -464,6 +466,7 @@ class migrator
 	* @param mixed $last_result Result to pass to the callable (only for 'custom' method)
 	* @param bool $reverse False to install, True to attempt uninstallation by reversing the call
 	* @return array Array with parameters for call_user_func_array(), 0 is the callable, 1 is parameters
+	* @throws \phpbb\db\migration\exception
 	*/
 	protected function get_callable_from_step(array $step, $last_result = 0, $reverse = false)
 	{
@@ -722,6 +725,7 @@ class migrator
 	* 	to prevent errors (if including multiple directories, check
 	* 	with the last call to prevent throwing errors unnecessarily).
 	* @return array Array of migration names
+	* @throws \phpbb\db\migration\exception
 	*/
 	public function load_migrations(\phpbb\finder $finder, $path, $check_fulfillable = true)
 	{
diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php
index 3d065ede8e..2ee842eace 100644
--- a/phpBB/phpbb/db/tools.php
+++ b/phpBB/phpbb/db/tools.php
@@ -1996,7 +1996,7 @@ class tools
 
 				$columns = implode(',', $column_list);
 
-				$new_table_cols = trim(preg_replace('/' . $column_name . '[^,]+(?:,|$)/m', '', $new_table_cols));
+				$new_table_cols = trim(preg_replace('/' . $column_name . '\b[^,]+(?:,|$)/m', '', $new_table_cols));
 				if (substr($new_table_cols, -1) === ',')
 				{
 					// Remove the comma from the last entry again
@@ -2561,7 +2561,18 @@ class tools
 
 				foreach ($old_table_cols as $key => $declaration)
 				{
-					$entities = preg_split('#\s+#', trim($declaration));
+					$declaration = trim($declaration);
+
+					// Check for the beginning of the constraint section and stop
+					if (preg_match('/[^\(]*\s*PRIMARY KEY\s+\(/', $declaration) ||
+						preg_match('/[^\(]*\s*UNIQUE\s+\(/', $declaration) ||
+						preg_match('/[^\(]*\s*FOREIGN KEY\s+\(/', $declaration) ||
+						preg_match('/[^\(]*\s*CHECK\s+\(/', $declaration))
+					{
+						break;
+					}
+
+					$entities = preg_split('#\s+#', $declaration);
 					$column_list[] = $entities[0];
 					if ($entities[0] == $column_name)
 					{