Merge pull request #247 from VSEphpbb/bugfix

Increase rule message size for postgres and mssql

Author: michaelcullum

migrations/v10x/m12_update_rule_message.php

@@ -0,0 +1,51 @@
+<?php
+/**
+*
+* Board Rules extension for the phpBB Forum Software package.
+*
+* @copyright (c) 2015 phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+*/
+
+namespace phpbb\boardrules\migrations\v10x;
+
+/**
+* Migration stage 12: Update the rule_message column type to MTEXT_UNI
+*/
+class m12_update_rule_message extends \phpbb\db\migration\migration
+{
+	/**
+	* Assign migration file dependencies for this migration
+	*
+	* @return array Array of migration files
+	* @static
+	* @access public
+	*/
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\boardrules\migrations\v10x\m1_initial_schema',
+			'\phpbb\boardrules\migrations\v10x\m7_sample_rule_data',
+		);
+	}
+
+	/**
+	* Update boardrules table schema
+	* Note: Do not revert this schema change or else an SQL error will occur
+	* when purging data if a postgres or mssql db has a large rule message.
+	*
+	* @return array Array of table schema
+	* @access public
+	*/
+	public function update_schema()
+	{
+		return array(
+			'change_columns'	=> array(
+				$this->table_prefix . 'boardrules'	=> array(
+					'rule_message'		=> array('MTEXT_UNI', ''),
+				),
+			),
+		);
+	}
+}

migrations/v10x/m3_add_schema.php

@@ -30,7 +30,7 @@ static public function depends_on()
 	/**
 	* Add table columns schema to the database:
 	*    boardrules:
-	*        rule_parents Basic rule data is serialzed and cached here
+	*        rule_parents Basic rule data is serialised and cached here
 	*
 	* @return array Array of table columns schema
 	* @access public

tests/functional/admin_controller_test.php

@@ -54,7 +54,7 @@ public function test_acp_create_rule($crawler)
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form(array(
 			'rule_title'	=> 'Test Rule',
 			'rule_anchor'	=> 'test-rule',
-			'rule_message'	=> 'This is a test rule.',
+			'rule_message'	=> str_repeat('test ', 1000), // 5000 character message
 		));
 		$crawler = self::submit($form);
 
@@ -77,8 +77,6 @@ public function test_acp_edit_rule()
 		// Assert edit page is displayed
 		$this->assertContainsLang('ACP_BOARDRULES_EDIT_RULE', $crawler->filter('#main')->text());
 		$this->assertContainsLang('ACP_BOARDRULES_EDIT_RULE_EXPLAIN', $crawler->filter('#main')->text());
-
-		return $rule_id;
 	}
 
 	/**