From e5eb7025141238a3486a0395c42c55411dafb259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Col=C3=B3n?= Date: Mon, 13 Feb 2017 14:03:54 -0500 Subject: [ticket/14992] Add indexes to user_notifications table [ticket/14992] Change how index length is checked [ticket/14992] Remove duplicates from user_notifications table [ticket/14992] Add unique index to user_notifications table [ticket/14992] Shorten unique index name [ticket/14992] Shorten another index for user notifications --- .../data/v32x/user_notifications_table_indexes.php | 50 ++++++++++++++++++++ .../user_notifications_table_remove_duplicates.php | 55 ++++++++++++++++++++++ .../v32x/user_notifications_table_unique_index.php | 46 ++++++++++++++++++ 3 files changed, 151 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v32x/user_notifications_table_indexes.php create mode 100644 phpBB/phpbb/db/migration/data/v32x/user_notifications_table_remove_duplicates.php create mode 100644 phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php (limited to 'phpBB/phpbb/db/migration/data') diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_indexes.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_indexes.php new file mode 100644 index 0000000000..86a3891b46 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_indexes.php @@ -0,0 +1,50 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v32x; + +class user_notifications_table_indexes extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v32x\cookie_notice_p2', + ); + } + + public function update_schema() + { + return array( + 'add_index' => array( + $this->table_prefix . 'user_notifications' => array( + 'user_id' => array('user_id'), + 'user_id_item_id' => array('user_id', 'item_id'), + 'user_itm_type_id' => array('user_id', 'item_type', 'item_id'), + ), + ), + ); + } + + public function revert_schema() + { + return array( + 'drop_keys' => array( + $this->table_prefix . 'user_notifications' => array( + 'user_id', + 'user_id_item_id', + 'user_itm_type_id', + ), + ), + ); + } +} diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_remove_duplicates.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_remove_duplicates.php new file mode 100644 index 0000000000..f5f0305fda --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_remove_duplicates.php @@ -0,0 +1,55 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v32x; + +class user_notifications_table_remove_duplicates extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v32x\user_notifications_table_indexes', + ); + } + + public function update_data() + { + return array( + array('custom', array(array($this, 'remove_duplicates'))), + ); + } + + public function remove_duplicates() + { + $insert_buffer = new \phpbb\db\sql_insert_buffer($this->db, $this->table_prefix . 'user_notifications'); + + $sql = "SELECT item_type, item_id, user_id, method, MAX(notify) AS notify + FROM {$this->table_prefix}user_notifications + GROUP BY item_type, item_id, user_id, method + HAVING COUNT(item_type) > 1"; + + $result = $this->sql_query($sql); + while ($row = $this->db->sql_fetchrow($result)) + { + // Delete the duplicate entries + $this->sql_query("DELETE FROM {$this->table_prefix}user_notifications + WHERE user_id = {$row['user_id']} + AND item_type = '{$row['item_type']}' + AND method = '{$row['method']}'"); + + // And re-insert as a single one + $insert_buffer->insert($row); + } + $this->db->sql_freeresult($result); + } +} diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php new file mode 100644 index 0000000000..925197a02b --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php @@ -0,0 +1,46 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v32x; + +class user_notifications_table_unique_index extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v32x\user_notifications_table_remove_duplicates', + ); + } + + public function update_schema() + { + return array( + 'add_unique_index' => array( + $this->table_prefix . 'user_notifications' => array( + 'itm_usr_mthd' => array('item_type', 'item_id', 'user_id', 'method'), + ), + ), + ); + } + + public function revert_schema() + { + return array( + 'drop_keys' => array( + $this->table_prefix . 'user_notifications' => array( + 'itm_usr_mthd', + ), + ), + ); + } +} -- cgit v1.2.1 From 59ac4a71b6dc53f2edf8bb5c669b14df9ce5544a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Col=C3=B3n?= Date: Wed, 1 Mar 2017 22:55:13 -0500 Subject: [ticket/14992] Check index name length in a more proper way [ticket/14992] Add indexes to user_notifications table --- .../v32x/user_notifications_table_index_p1.php | 46 ++++++++++++++++++++ .../v32x/user_notifications_table_index_p2.php | 46 ++++++++++++++++++++ .../v32x/user_notifications_table_index_p3.php | 46 ++++++++++++++++++++ .../data/v32x/user_notifications_table_indexes.php | 50 ---------------------- .../user_notifications_table_remove_duplicates.php | 2 +- .../v32x/user_notifications_table_temp_index.php | 46 ++++++++++++++++++++ .../v32x/user_notifications_table_unique_index.php | 7 ++- 7 files changed, 191 insertions(+), 52 deletions(-) create mode 100644 phpBB/phpbb/db/migration/data/v32x/user_notifications_table_index_p1.php create mode 100644 phpBB/phpbb/db/migration/data/v32x/user_notifications_table_index_p2.php create mode 100644 phpBB/phpbb/db/migration/data/v32x/user_notifications_table_index_p3.php delete mode 100644 phpBB/phpbb/db/migration/data/v32x/user_notifications_table_indexes.php create mode 100644 phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php (limited to 'phpBB/phpbb/db/migration/data') diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_index_p1.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_index_p1.php new file mode 100644 index 0000000000..93ff31ec6c --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_index_p1.php @@ -0,0 +1,46 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v32x; + +class user_notifications_table_index_p1 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v32x\cookie_notice_p2', + ); + } + + public function update_schema() + { + return array( + 'add_index' => array( + $this->table_prefix . 'user_notifications' => array( + 'user_id' => array('user_id'), + ), + ), + ); + } + + public function revert_schema() + { + return array( + 'drop_keys' => array( + $this->table_prefix . 'user_notifications' => array( + 'user_id', + ), + ), + ); + } +} diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_index_p2.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_index_p2.php new file mode 100644 index 0000000000..e492b4e1f8 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_index_p2.php @@ -0,0 +1,46 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v32x; + +class user_notifications_table_index_p2 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v32x\user_notifications_table_index_p1', + ); + } + + public function update_schema() + { + return array( + 'add_index' => array( + $this->table_prefix . 'user_notifications' => array( + 'usr_id_itm_id' => array('user_id', 'item_id'), + ), + ), + ); + } + + public function revert_schema() + { + return array( + 'drop_keys' => array( + $this->table_prefix . 'user_notifications' => array( + 'usr_id_itm_id', + ), + ), + ); + } +} diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_index_p3.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_index_p3.php new file mode 100644 index 0000000000..1636b3024a --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_index_p3.php @@ -0,0 +1,46 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v32x; + +class user_notifications_table_index_p3 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v32x\user_notifications_table_index_p2', + ); + } + + public function update_schema() + { + return array( + 'add_index' => array( + $this->table_prefix . 'user_notifications' => array( + 'usr_itm_tpe' => array('user_id', 'item_type', 'item_id'), + ), + ), + ); + } + + public function revert_schema() + { + return array( + 'drop_keys' => array( + $this->table_prefix . 'user_notifications' => array( + 'usr_itm_tpe', + ), + ), + ); + } +} diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_indexes.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_indexes.php deleted file mode 100644 index 86a3891b46..0000000000 --- a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_indexes.php +++ /dev/null @@ -1,50 +0,0 @@ - - * @license GNU General Public License, version 2 (GPL-2.0) - * - * For full copyright and license information, please see - * the docs/CREDITS.txt file. - * - */ - -namespace phpbb\db\migration\data\v32x; - -class user_notifications_table_indexes extends \phpbb\db\migration\migration -{ - static public function depends_on() - { - return array( - '\phpbb\db\migration\data\v32x\cookie_notice_p2', - ); - } - - public function update_schema() - { - return array( - 'add_index' => array( - $this->table_prefix . 'user_notifications' => array( - 'user_id' => array('user_id'), - 'user_id_item_id' => array('user_id', 'item_id'), - 'user_itm_type_id' => array('user_id', 'item_type', 'item_id'), - ), - ), - ); - } - - public function revert_schema() - { - return array( - 'drop_keys' => array( - $this->table_prefix . 'user_notifications' => array( - 'user_id', - 'user_id_item_id', - 'user_itm_type_id', - ), - ), - ); - } -} diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_remove_duplicates.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_remove_duplicates.php index f5f0305fda..50d0642056 100644 --- a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_remove_duplicates.php +++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_remove_duplicates.php @@ -18,7 +18,7 @@ class user_notifications_table_remove_duplicates extends \phpbb\db\migration\mig static public function depends_on() { return array( - '\phpbb\db\migration\data\v32x\user_notifications_table_indexes', + '\phpbb\db\migration\data\v32x\user_notifications_table_temp_index', ); } diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php new file mode 100644 index 0000000000..eea44e168c --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php @@ -0,0 +1,46 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v32x; + +class user_notifications_table_temp_index extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v32x\user_notifications_table_index_p3', + ); + } + + public function update_schema() + { + return array( + 'add_index' => array( + $this->table_prefix . 'user_notifications' => array( + 'itm_usr_mthd' => array('item_type', 'item_id', 'user_id', 'method'), + ), + ), + ); + } + + public function revert_schema() + { + return array( + 'drop_keys' => array( + $this->table_prefix . 'user_notifications' => array( + 'itm_usr_mthd', + ), + ), + ); + } +} diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php index 925197a02b..51cf90c8a0 100644 --- a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php +++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php @@ -25,7 +25,12 @@ class user_notifications_table_unique_index extends \phpbb\db\migration\migratio public function update_schema() { return array( - 'add_unique_index' => array( + 'drop_keys' => array( + $this->table_prefix . 'user_notifications' => array( + 'itm_usr_mthd', + ), + ), + 'add_unique_index' => array( $this->table_prefix . 'user_notifications' => array( 'itm_usr_mthd' => array('item_type', 'item_id', 'user_id', 'method'), ), -- cgit v1.2.1 From 11f968e774fed238030f851c4ad90facf86e583f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 21 May 2017 14:18:10 +0200 Subject: [ticket/14992] Shorten index name for user_id and item_id PHPBB3-14992 --- .../db/migration/data/v32x/user_notifications_table_index_p2.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/phpbb/db/migration/data') diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_index_p2.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_index_p2.php index e492b4e1f8..0a471766a0 100644 --- a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_index_p2.php +++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_index_p2.php @@ -27,7 +27,7 @@ class user_notifications_table_index_p2 extends \phpbb\db\migration\migration return array( 'add_index' => array( $this->table_prefix . 'user_notifications' => array( - 'usr_id_itm_id' => array('user_id', 'item_id'), + 'uid_itm_id' => array('user_id', 'item_id'), ), ), ); @@ -38,7 +38,7 @@ class user_notifications_table_index_p2 extends \phpbb\db\migration\migration return array( 'drop_keys' => array( $this->table_prefix . 'user_notifications' => array( - 'usr_id_itm_id', + 'uid_itm_id', ), ), ); -- cgit v1.2.1 From f3c782b3584c1c006e5d3da602ff953381f3e6b9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 21 May 2017 16:14:11 +0200 Subject: [ticket/14992] Make unit tests run more verbose PHPBB3-14992 --- .../db/migration/data/v32x/user_notifications_table_temp_index.php | 2 +- .../db/migration/data/v32x/user_notifications_table_unique_index.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/phpbb/db/migration/data') diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php index eea44e168c..a6a321dbde 100644 --- a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php +++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php @@ -27,7 +27,7 @@ class user_notifications_table_temp_index extends \phpbb\db\migration\migration return array( 'add_index' => array( $this->table_prefix . 'user_notifications' => array( - 'itm_usr_mthd' => array('item_type', 'item_id', 'user_id', 'method'), + 'itm_usr_mthd' => array('item_type', 'item_id', 'user_id'), ), ), ); diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php index 51cf90c8a0..d279af7fec 100644 --- a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php +++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php @@ -32,7 +32,7 @@ class user_notifications_table_unique_index extends \phpbb\db\migration\migratio ), 'add_unique_index' => array( $this->table_prefix . 'user_notifications' => array( - 'itm_usr_mthd' => array('item_type', 'item_id', 'user_id', 'method'), + 'itm_usr_mthd' => array('item_type', 'item_id', 'user_id'), ), ), ); -- cgit v1.2.1 From c2711fb6c46b47a4004319b6887d07487baef0dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Col=C3=B3n?= Date: Tue, 23 May 2017 13:57:28 -0400 Subject: [ticket/14992] Remove temp index migration --- .../user_notifications_table_remove_duplicates.php | 2 +- .../v32x/user_notifications_table_temp_index.php | 46 ---------------------- .../v32x/user_notifications_table_unique_index.php | 5 --- 3 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php (limited to 'phpBB/phpbb/db/migration/data') diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_remove_duplicates.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_remove_duplicates.php index 50d0642056..371cdf9b3a 100644 --- a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_remove_duplicates.php +++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_remove_duplicates.php @@ -18,7 +18,7 @@ class user_notifications_table_remove_duplicates extends \phpbb\db\migration\mig static public function depends_on() { return array( - '\phpbb\db\migration\data\v32x\user_notifications_table_temp_index', + '\phpbb\db\migration\data\v32x\user_notifications_table_index_p3', ); } diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php deleted file mode 100644 index a6a321dbde..0000000000 --- a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php +++ /dev/null @@ -1,46 +0,0 @@ - - * @license GNU General Public License, version 2 (GPL-2.0) - * - * For full copyright and license information, please see - * the docs/CREDITS.txt file. - * - */ - -namespace phpbb\db\migration\data\v32x; - -class user_notifications_table_temp_index extends \phpbb\db\migration\migration -{ - static public function depends_on() - { - return array( - '\phpbb\db\migration\data\v32x\user_notifications_table_index_p3', - ); - } - - public function update_schema() - { - return array( - 'add_index' => array( - $this->table_prefix . 'user_notifications' => array( - 'itm_usr_mthd' => array('item_type', 'item_id', 'user_id'), - ), - ), - ); - } - - public function revert_schema() - { - return array( - 'drop_keys' => array( - $this->table_prefix . 'user_notifications' => array( - 'itm_usr_mthd', - ), - ), - ); - } -} diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php index d279af7fec..3145b634c8 100644 --- a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php +++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php @@ -25,11 +25,6 @@ class user_notifications_table_unique_index extends \phpbb\db\migration\migratio public function update_schema() { return array( - 'drop_keys' => array( - $this->table_prefix . 'user_notifications' => array( - 'itm_usr_mthd', - ), - ), 'add_unique_index' => array( $this->table_prefix . 'user_notifications' => array( 'itm_usr_mthd' => array('item_type', 'item_id', 'user_id'), -- cgit v1.2.1 From 4c67f65d5db539ffc94259549d1cbf270703d7be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Col=C3=B3n?= Date: Wed, 24 May 2017 16:56:24 -0400 Subject: [ticket/14992] 'method' is needed for the unique index --- .../db/migration/data/v32x/user_notifications_table_unique_index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/phpbb/db/migration/data') diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php index 3145b634c8..157a12472b 100644 --- a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php +++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php @@ -27,7 +27,7 @@ class user_notifications_table_unique_index extends \phpbb\db\migration\migratio return array( 'add_unique_index' => array( $this->table_prefix . 'user_notifications' => array( - 'itm_usr_mthd' => array('item_type', 'item_id', 'user_id'), + 'itm_usr_mthd' => array('item_type', 'item_id', 'user_id', 'method'), ), ), ); -- cgit v1.2.1 From a6317dc52dded6eeb3adb174b5d843673b7dbc15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Col=C3=B3n?= Date: Wed, 24 May 2017 17:34:17 -0400 Subject: [ticket/14992] Reduce notification table col sizes --- ...ser_notifications_table_reduce_column_sizes.php | 48 ++++++++++++++++++++++ .../v32x/user_notifications_table_unique_index.php | 2 +- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 phpBB/phpbb/db/migration/data/v32x/user_notifications_table_reduce_column_sizes.php (limited to 'phpBB/phpbb/db/migration/data') diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_reduce_column_sizes.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_reduce_column_sizes.php new file mode 100644 index 0000000000..c2efb8fd4f --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_reduce_column_sizes.php @@ -0,0 +1,48 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v32x; + +class user_notifications_table_reduce_column_sizes extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v32x\user_notifications_table_remove_duplicates', + ); + } + + public function update_schema() + { + return array( + 'change_columns' => array( + $this->table_prefix . 'user_notifications' => array( + 'item_type' => array('VCHAR:165', ''), + 'method' => array('VCHAR:165', ''), + ), + ), + ); + } + + public function revert_schema() + { + return array( + 'change_columns' => array( + $this->table_prefix . 'user_notifications' => array( + 'item_type' => array('VCHAR:255', ''), + 'method' => array('VCHAR:255', ''), + ), + ), + ); + } +} diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php index 157a12472b..e46c231b7b 100644 --- a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php +++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php @@ -18,7 +18,7 @@ class user_notifications_table_unique_index extends \phpbb\db\migration\migratio static public function depends_on() { return array( - '\phpbb\db\migration\data\v32x\user_notifications_table_remove_duplicates', + '\phpbb\db\migration\data\v32x\user_notifications_table_reduce_column_sizes', ); } -- cgit v1.2.1