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:
authorMadhura Jayaratne <madhura.cj@gmail.com>2015-07-13 12:44:15 +0300
committerMadhura Jayaratne <madhura.cj@gmail.com>2015-07-13 12:44:15 +0300
commita3285a7cd3d2b1345019f4b53d0a4a0b0f4d4c06 (patch)
treee5a495a880f358fa2f41f9250d7e671dd96d8b7c /test
parent8634d9d086f955f1308a148801a7763abd2a9f4d (diff)
Support MySQL 5.7.5 virtual columns
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Diffstat (limited to 'test')
-rw-r--r--test/classes/PMA_Table_test.php19
1 files changed, 11 insertions, 8 deletions
diff --git a/test/classes/PMA_Table_test.php b/test/classes/PMA_Table_test.php
index f6eaed3758..dd0d60a207 100644
--- a/test/classes/PMA_Table_test.php
+++ b/test/classes/PMA_Table_test.php
@@ -475,14 +475,15 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase
$default_type = 'USER_DEFINED';
$default_value = 12;
$extra = 'AUTO_INCREMENT';
-
$comment = 'PMA_comment';
+ $virtuality = '';
+ $expression = '';
$move_to = '-first';
$query = PMA_Table::generateFieldSpec(
$name, $type, $length, $attribute, $collation,
$null, $default_type, $default_value, $extra, $comment,
- $move_to
+ $virtuality, $expression, $move_to
);
$this->assertEquals(
"`PMA_name` BIT(12) PMA_attribute NULL DEFAULT b'10' "
@@ -495,7 +496,7 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase
$query = PMA_Table::generateFieldSpec(
$name, $type, $length, $attribute, $collation,
$null, $default_type, $default_value, $extra, $comment,
- $move_to
+ $virtuality, $expression, $move_to
);
$this->assertEquals(
"`PMA_name` DOUBLE(12) PMA_attribute NULL DEFAULT '12' "
@@ -508,7 +509,7 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase
$query = PMA_Table::generateFieldSpec(
$name, $type, $length, $attribute, $collation,
$null, $default_type, $default_value, $extra, $comment,
- $move_to
+ $virtuality, $expression, $move_to
);
$this->assertEquals(
"`PMA_name` BOOLEAN PMA_attribute NULL DEFAULT TRUE "
@@ -521,7 +522,7 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase
$query = PMA_Table::generateFieldSpec(
$name, $type, $length, $attribute, $collation,
$null, $default_type, $default_value, $extra, $comment,
- $move_to
+ $virtuality, $expression, $move_to
);
$this->assertEquals(
"`PMA_name` BOOLEAN PMA_attribute NULL DEFAULT NULL "
@@ -534,7 +535,7 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase
$query = PMA_Table::generateFieldSpec(
$name, $type, $length, $attribute, $collation,
$null, $default_type, $default_value, $extra, $comment,
- $move_to
+ $virtuality, $expression, $move_to
);
$this->assertEquals(
"`PMA_name` BOOLEAN PMA_attribute NULL DEFAULT CURRENT_TIMESTAMP "
@@ -549,7 +550,7 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase
$query = PMA_Table::generateFieldSpec(
$name, $type, $length, $attribute, $collation,
$null, $default_type, $default_value, $extra, $comment,
- $move_to
+ $virtuality, $expression, $move_to
);
$this->assertEquals(
"`PMA_name` BOOLEAN PMA_attribute NULL INCREMENT "
@@ -678,12 +679,14 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase
$default_value = 'VARCHAR';
$extra = 'AUTO_INCREMENT';
$comment = 'PMA comment';
+ $virtuality = '';
+ $expression = '';
$move_to = 'new_name';
$result = PMA_Table::generateAlter(
$oldcol, $newcol, $type, $length,
$attribute, $collation, $null, $default_type, $default_value,
- $extra, $comment, $move_to
+ $extra, $comment, $virtuality, $expression, $move_to
);
$expect = "";