8 files changed, 34 insertions, 26 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/notifications.php b/phpBB/phpbb/db/migration/data/v310/notifications.php
index 10f1392094..61be25bb5f 100644
--- a/phpBB/phpbb/db/migration/data/v310/notifications.php
+++ b/phpBB/phpbb/db/migration/data/v310/notifications.php
@@ -34,7 +34,7 @@ class notifications extends \phpbb\db\migration\migration
 				),
 				$this->table_prefix . 'notifications'		=> array(
 					'COLUMNS'			=> array(
-						'notification_id'  				=> array('UINT', NULL, 'auto_increment'),
+						'notification_id'  				=> array('UINT', null, 'auto_increment'),
 						'item_type'			   			=> array('VCHAR:255', ''),
 						'item_id'		  				=> array('UINT', 0),
 						'item_parent_id'   				=> array('UINT', 0),
diff --git a/phpBB/phpbb/db/migration/data/v310/notifications_schema_fix.php b/phpBB/phpbb/db/migration/data/v310/notifications_schema_fix.php
index 8ed626d8a6..eb2eb361ee 100644
--- a/phpBB/phpbb/db/migration/data/v310/notifications_schema_fix.php
+++ b/phpBB/phpbb/db/migration/data/v310/notifications_schema_fix.php
@@ -26,7 +26,7 @@ class notifications_schema_fix extends \phpbb\db\migration\migration
 			'add_tables'		=> array(
 				$this->table_prefix . 'notification_types'	=> array(
 					'COLUMNS'			=> array(
-						'notification_type_id'		=> array('USINT', NULL, 'auto_increment'),
+						'notification_type_id'		=> array('USINT', null, 'auto_increment'),
 						'notification_type_name'	=> array('VCHAR:255', ''),
 						'notification_type_enabled'	=> array('BOOL', 1),
 					),
@@ -37,7 +37,7 @@ class notifications_schema_fix extends \phpbb\db\migration\migration
 				),
 				$this->table_prefix . 'notifications'		=> array(
 					'COLUMNS'			=> array(
-						'notification_id'				=> array('UINT:10', NULL, 'auto_increment'),
+						'notification_id'				=> array('UINT:10', null, 'auto_increment'),
 						'notification_type_id'			=> array('USINT', 0),
 						'item_id'						=> array('UINT', 0),
 						'item_parent_id'				=> array('UINT', 0),
@@ -73,7 +73,7 @@ class notifications_schema_fix extends \phpbb\db\migration\migration
 				),
 				$this->table_prefix . 'notifications'		=> array(
 					'COLUMNS'			=> array(
-						'notification_id'  				=> array('UINT', NULL, 'auto_increment'),
+						'notification_id'  				=> array('UINT', null, 'auto_increment'),
 						'item_type'			   			=> array('VCHAR:255', ''),
 						'item_id'		  				=> array('UINT', 0),
 						'item_parent_id'   				=> array('UINT', 0),
diff --git a/phpBB/phpbb/db/migration/data/v310/softdelete_p2.php b/phpBB/phpbb/db/migration/data/v310/softdelete_p2.php
index 0c32e474f4..38b190c766 100644
--- a/phpBB/phpbb/db/migration/data/v310/softdelete_p2.php
+++ b/phpBB/phpbb/db/migration/data/v310/softdelete_p2.php
@@ -34,7 +34,10 @@ class softdelete_p2 extends \phpbb\db\migration\migration
 			),
 			'drop_keys'		=> array(
 				$this->table_prefix . 'posts'			=> array('post_approved'),
-				$this->table_prefix . 'topics'			=> array('forum_appr_last'),
+				$this->table_prefix . 'topics'			=> array(
+					'forum_appr_last',
+					'topic_approved',
+				),
 			),
 		);
 	}
@@ -63,6 +66,7 @@ class softdelete_p2 extends \phpbb\db\migration\migration
 				),
 				$this->table_prefix . 'topics'		=> array(
 					'forum_appr_last'	=> array('forum_id', 'topic_approved', 'topic_last_post_id'),
+					'topic_approved'	=> array('topic_approved'),
 				),
 			),
 		);
diff --git a/phpBB/phpbb/db/migration/data/v310/style_update_p2.php b/phpBB/phpbb/db/migration/data/v310/style_update_p2.php
index 202a8409fb..40d6a4dbbd 100644
--- a/phpBB/phpbb/db/migration/data/v310/style_update_p2.php
+++ b/phpBB/phpbb/db/migration/data/v310/style_update_p2.php
@@ -24,6 +24,14 @@ class style_update_p2 extends \phpbb\db\migration\migration
 	public function update_schema()
 	{
 		return array(
+			'drop_keys'	=> array(
+				$this->table_prefix . 'styles'		=> array(
+					'imageset_id',
+					'template_id',
+					'theme_id',
+				),
+			),
+
 			'drop_columns'	=> array(
 				$this->table_prefix . 'styles'		=> array(
 					'imageset_id',
@@ -53,10 +61,18 @@ class style_update_p2 extends \phpbb\db\migration\migration
 				),
 			),
 
+			'add_index'		=> array(
+				$this->table_prefix . 'styles'			=> array(
+					'imageset_id'		=> array('imageset_id'),
+					'template_id'		=> array('template_id'),
+					'theme_id'			=> array('theme_id'),
+				),
+			),
+
 			'add_tables'	=> array(
 				$this->table_prefix . 'styles_imageset'		=> array(
 					'COLUMNS'		=> array(
-						'imageset_id'				=> array('UINT', NULL, 'auto_increment'),
+						'imageset_id'				=> array('UINT', null, 'auto_increment'),
 						'imageset_name'				=> array('VCHAR_UNI:255', ''),
 						'imageset_copyright'		=> array('VCHAR_UNI', ''),
 						'imageset_path'				=> array('VCHAR:100', ''),
@@ -68,7 +84,7 @@ class style_update_p2 extends \phpbb\db\migration\migration
 				),
 				$this->table_prefix . 'styles_imageset_data'	=> array(
 					'COLUMNS'		=> array(
-						'image_id'				=> array('UINT', NULL, 'auto_increment'),
+						'image_id'				=> array('UINT', null, 'auto_increment'),
 						'image_name'			=> array('VCHAR:200', ''),
 						'image_filename'		=> array('VCHAR:200', ''),
 						'image_lang'			=> array('VCHAR:30', ''),
@@ -83,7 +99,7 @@ class style_update_p2 extends \phpbb\db\migration\migration
 				),
 				$this->table_prefix . 'styles_template'		=> array(
 					'COLUMNS'		=> array(
-						'template_id'			=> array('UINT', NULL, 'auto_increment'),
+						'template_id'			=> array('UINT', null, 'auto_increment'),
 						'template_name'			=> array('VCHAR_UNI:255', ''),
 						'template_copyright'	=> array('VCHAR_UNI', ''),
 						'template_path'			=> array('VCHAR:100', ''),
@@ -112,7 +128,7 @@ class style_update_p2 extends \phpbb\db\migration\migration
 				),
 				$this->table_prefix . 'styles_theme'			=> array(
 					'COLUMNS'		=> array(
-						'theme_id'				=> array('UINT', NULL, 'auto_increment'),
+						'theme_id'				=> array('UINT', null, 'auto_increment'),
 						'theme_name'			=> array('VCHAR_UNI:255', ''),
 						'theme_copyright'		=> array('VCHAR_UNI', ''),
 						'theme_path'			=> array('VCHAR:100', ''),
diff --git a/phpBB/phpbb/db/migration/data/v310/teampage.php b/phpBB/phpbb/db/migration/data/v310/teampage.php
index 80cc4be1c0..172435c672 100644
--- a/phpBB/phpbb/db/migration/data/v310/teampage.php
+++ b/phpBB/phpbb/db/migration/data/v310/teampage.php
@@ -27,7 +27,7 @@ class teampage extends \phpbb\db\migration\migration
 			'add_tables'		=> array(
 				$this->table_prefix . 'teampage'	=> array(
 					'COLUMNS'		=> array(
-						'teampage_id'		=> array('UINT', NULL, 'auto_increment'),
+						'teampage_id'		=> array('UINT', null, 'auto_increment'),
 						'group_id'			=> array('UINT', 0),
 						'teampage_name'		=> array('VCHAR_UNI:255', ''),
 						'teampage_position'	=> array('UINT', 0),
diff --git a/phpBB/phpbb/db/migration/exception.php b/phpBB/phpbb/db/migration/exception.php
index 58e29b5218..cfe546d1ab 100644
--- a/phpBB/phpbb/db/migration/exception.php
+++ b/phpBB/phpbb/db/migration/exception.php
@@ -10,14 +10,6 @@
 namespace phpbb\db\migration;
 
 /**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
 * The migrator is responsible for applying new migrations in the correct order.
 *
 * @package db
diff --git a/phpBB/phpbb/db/migration/migration.php b/phpBB/phpbb/db/migration/migration.php
index aff3837279..b32de00871 100644
--- a/phpBB/phpbb/db/migration/migration.php
+++ b/phpBB/phpbb/db/migration/migration.php
@@ -10,14 +10,6 @@
 namespace phpbb\db\migration;
 
 /**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
 * Abstract base class for database migrations
 *
 * Each migration consists of a set of schema and data changes to be implemented
diff --git a/phpBB/phpbb/db/migration/tool/config.php b/phpBB/phpbb/db/migration/tool/config.php
index f2149dc59a..36a1931f4e 100644
--- a/phpBB/phpbb/db/migration/tool/config.php
+++ b/phpBB/phpbb/db/migration/tool/config.php
@@ -130,6 +130,10 @@ class config implements \phpbb\db\migration\tool\tool_interface
 
 			case 'remove':
 				$call = 'add';
+				if (sizeof($arguments) == 1)
+				{
+					$arguments[] = '';
+				}
 			break;
 
 			case 'update_if_equals':