[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-24868-g07472a7

The branch, master has been updated via 07472a7f2a726580b02c2c14a7ab852b2ccac90d (commit) from bb1fd3c966b04d3ed8374d065ad804c6d58643d8 (commit) - Log ----------------------------------------------------------------- commit 07472a7f2a726580b02c2c14a7ab852b2ccac90d Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Dec 16 15:40:04 2011 +0100 Make this test pass (it was built not to expect links to documentation) ----------------------------------------------------------------------- Summary of changes: test/libraries/common/PMA_formatSql_test.php | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/libraries/common/PMA_formatSql_test.php b/test/libraries/common/PMA_formatSql_test.php index ca1c567..809ebb1 100644 --- a/test/libraries/common/PMA_formatSql_test.php +++ b/test/libraries/common/PMA_formatSql_test.php @@ -53,7 +53,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLfmTypeHtml_1(){ global $cfg; $cfg['SQP']['fmtType'] = 'html'; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $sql = array ( 'raw' => 'SELECT 1;', @@ -87,7 +87,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLfmTypeHtml_2(){ global $cfg; $cfg['SQP']['fmtType'] = 'html'; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $unparsed = "SELECT * from `tTable`;"; $sql = array ( @@ -134,7 +134,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLfmTypeHtml_3(){ global $cfg; $cfg['SQP']['fmtType'] = 'html'; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $unparsed = 'SELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON B.ID = A.ID;'; $sql = array ( @@ -269,7 +269,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLfmTypeText_1(){ global $cfg; $cfg['SQP']['fmtType'] = 'text'; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $sql = array ( 'raw' => 'SELECT 1;', @@ -303,7 +303,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLfmTypeText_2(){ global $cfg; $cfg['SQP']['fmtType'] = 'text'; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $unparsed = "SELECT * from `tTable`;"; $sql = array ( @@ -350,7 +350,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLfmTypeText_3(){ global $cfg; $cfg['SQP']['fmtType'] = 'text'; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $unparsed = 'SELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON B.ID = A.ID;'; $sql = array ( @@ -484,7 +484,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLfmTypeNone_1(){ global $cfg; $cfg['SQP']['fmtType'] = 'none'; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $sql = array ( 'raw' => 'SELECT 1;', @@ -521,7 +521,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLfmTypeNone_2(){ global $cfg; $cfg['SQP']['fmtType'] = 'none'; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $unparsed = "SELECT * from `tTable`;"; $sql = array ( @@ -571,7 +571,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLfmTypeNone_3(){ global $cfg; $cfg['SQP']['fmtType'] = 'none'; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $unparsed = 'SELECT * FROM `tTable_A` A INNER JOIN `tTable_B` B ON B.ID = A.ID;'; $sql = array ( @@ -708,7 +708,7 @@ class PMA_formatSql_test extends PHPUnit_Framework_TestCase function testFormatSQLWithoutType(){ global $cfg; $cfg['SQP']['fmtType'] = ''; - $cfg['MySQLManualType'] = 'viewable'; + $cfg['MySQLManualType'] = 'none'; $sql = array ( 'raw' => 'SELECT 1;', 0 => hooks/post-receive -- phpMyAdmin