Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMichal Čihař <michal@cihar.com>2014-03-28 17:47:15 +0400
committerMichal Čihař <michal@cihar.com>2014-03-28 17:47:15 +0400
commit824fd5f1dd09d81257492a009082022b61b9ef0a (patch)
tree679039f9474c8f9154f436a6784e843adbe19a19 /test
parent093df7e321f7e16637698803ff06635689483f55 (diff)
parent4346955b4537d240e4f01368b9414b5e305fc862 (diff)
Merge pull request #1091 from ashutoshdhundhara/feature_1329_rev_2
Feature Request: #1329 Can't rename column with foreign key constraint.
Diffstat (limited to 'test')
-rw-r--r--test/libraries/PMA_tbl_columns_definition_form_test.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/libraries/PMA_tbl_columns_definition_form_test.php b/test/libraries/PMA_tbl_columns_definition_form_test.php
index 35c1b2ce77..686b57b93b 100644
--- a/test/libraries/PMA_tbl_columns_definition_form_test.php
+++ b/test/libraries/PMA_tbl_columns_definition_form_test.php
@@ -617,7 +617,9 @@ class PMA_TblColumnsDefinitionFormTest extends PHPUnit_Framework_TestCase
public function testGetHtmlForColumnName()
{
$result = PMA_getHtmlForColumnName(
- 2, 4, 4, array('Field' => "fieldname")
+ 2, 4, 4, array('Field' => "fieldname",
+ 'column_status' => array('isReferenced' => false,
+ 'isForeignKey' => false, 'isEditable' => true))
);
$this->assertTag(
@@ -639,7 +641,8 @@ class PMA_TblColumnsDefinitionFormTest extends PHPUnit_Framework_TestCase
{
$GLOBALS['PMA_Types'] = new PMA_Types;
$result = PMA_getHtmlForColumnType(
- 1, 4, 3, false
+ 1, 4, 3, false, array('column_status' => array('isReferenced' => false,
+ 'isForeignKey' => false, 'isEditable' => true))
);
$this->assertTag(