webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Code Activity

Merge commit '28074d2'

Browse Source
This commit is contained in:
Marc Delisle
2014-05-23 10:22:51 -04:00
parent 9373e1b204 28074d27f4
commit 20b2a3a707
3 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
test/libraries/PMA_Tracker_test.php
View File

@@ -812,32 +812,36 @@ class PMA_Tracker_Test extends PHPUnit_Framework_TestCase
*/
public function getTrackedDataProvider()
{
$fetchArrayReturn[0] = array(
"schema_sql" => "# log 20-03-2013 23:33:58 user1\nstat1" .
"# log 20-03-2013 23:39:58 user2\n",
"data_sql" => "# log ",
"schema_snapshot" => "dataschema",
"tracking" => "SELECT, DELETE"
$fetchArrayReturn = array(
array(
"schema_sql" => "# log 20-03-2013 23:33:58 user1\nstat1" .
"# log 20-03-2013 23:39:58 user2\n",
"data_sql" => "# log ",
"schema_snapshot" => "dataschema",
"tracking" => "SELECT, DELETE"
)
);
$data[0] = array(
'date_from' => '20-03-2013 23:33:58',
'date_to' => '20-03-2013 23:39:58',
'ddlog' => array(
array(
'date' => '20-03-2013 23:33:58',
'username' => 'user1',
'statement' => "\nstat1"
$data = array(
array(
'date_from' => '20-03-2013 23:33:58',
'date_to' => '20-03-2013 23:39:58',
'ddlog' => array(
array(
'date' => '20-03-2013 23:33:58',
'username' => 'user1',
'statement' => "\nstat1"
),
array(
'date' => '20-03-2013 23:39:58',
'username' => 'user2',
'statement' => ""
)
),
array(
'date' => '20-03-2013 23:39:58',
'username' => 'user2',
'statement' => ""
)
),
'dmlog' => array(),
"schema_snapshot" => "dataschema",
"tracking" => "SELECT, DELETE"
'dmlog' => array(),
"schema_snapshot" => "dataschema",
"tracking" => "SELECT, DELETE"
)
);
$fetchArrayReturn[1] = array(

10
test/libraries/PMA_insert_edit_test.php
View File

@@ -746,7 +746,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
*/
public function testGetForeignLink()
{
$column = array();
$column = $titles = array();
$column['Field'] = 'f';
$titles['Browse'] = "'";
$GLOBALS['cfg']['ServerDefault'] = 2;
@@ -2268,6 +2268,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
*/
public function testGetDisplayValueForForeignTableColumn()
{
$map = array();
$map['f']['foreign_db'] = 'information_schema';
$map['f']['foreign_table'] = 'TABLES';
$map['f']['foreign_field'] = 'f';
@@ -2312,6 +2313,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
{
$GLOBALS['cfg']['ServerDefault'] = 1;
$_SESSION['tmpval']['relational_display'] = 'K';
$map = array();
$map['f']['foreign_db'] = 'information_schema';
$map['f']['foreign_table'] = 'TABLES';
$map['f']['foreign_field'] = 'f';
@@ -2348,7 +2350,9 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
);
$GLOBALS['cfg']['ServerDefault'] = 1;
$_REQUEST['where_clause'] = 1;
$transformation['transformation_options'] = "'','option ,, quoted',abd";
$transformation = array(
'transformation_options' => "'','option ,, quoted',abd"
);
$result = PMA_transformEditedValues(
'db', 'table', $transformation, $edited_values,
'Text_Plain_Preappend.class.php', 'c', array('a' => 'b')
@@ -2367,7 +2371,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
*/
public function testGetQueryValuesForInsertAndUpdateInMultipleEdit()
{
$multi_edit_columns_name[0] = 'fld';
$multi_edit_columns_name = array('fld');
$result = PMA_getQueryValuesForInsertAndUpdateInMultipleEdit(
$multi_edit_columns_name, null, null, null, null, true, array(1),

9
test/libraries/PMA_tbl_columns_definition_form_test.php
View File

@@ -961,9 +961,12 @@ class PMA_TblColumnsDefinitionFormTest extends PHPUnit_Framework_TestCase
$colspec = array('attribute' => 'attr');
$analyzed_sql[0]['create_table_fields'] = array(
'f' => array(
'default_current_timestamp' => true,
$analyzed_sql = array(
array(
'create_table_fields' => array(
'f' => array(
'default_current_timestamp' => true,
)
)
);