From 23dee32a299d320ced92884bca389a951aefe9a0 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 27 Aug 2013 22:07:23 +0530 Subject: [PATCH] Fix failing test --- libraries/insert_edit.lib.php | 4 +--- test/libraries/PMA_insert_edit_test.php | 10 +++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 67bfd34351..8e97f480d0 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -2426,9 +2426,7 @@ function PMA_verifyWhetherValueCanBeTruncatedAndAppendExtraData( . PMA_Util::backquote($table) . ' WHERE ' . $_REQUEST['where_clause'][0]; - $result = $GLOBALS['dbi']->tryQuery( - $sql_for_real_value, 0, PMA_DatabaseInterface::QUERY_STORE, false - ); + $result = $GLOBALS['dbi']->tryQuery($sql_for_real_value); $fields_meta = $GLOBALS['dbi']->getFieldsMeta($result); $meta = $fields_meta[0]; $new_value = $GLOBALS['dbi']->fetchValue($result); diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php index 099980fd7b..4933c93081 100644 --- a/test/libraries/PMA_insert_edit_test.php +++ b/test/libraries/PMA_insert_edit_test.php @@ -2547,17 +2547,17 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase ->getMock(); $dbi->expects($this->at(0)) - ->method('fetchValue') + ->method('tryQuery') ->with('SELECT `table`.`a` FROM `db`.`table` WHERE 1') ->will($this->returnValue(false)); - $dbi->expects($this->at(1)) - ->method('fetchValue') + $dbi->expects($this->at(3)) + ->method('tryQuery') ->with('SELECT `table`.`a` FROM `db`.`table` WHERE 1') ->will($this->returnValue('123')); - $dbi->expects($this->at(2)) - ->method('fetchValue') + $dbi->expects($this->at(6)) + ->method('tryQuery') ->with('SELECT `table`.`a` FROM `db`.`table` WHERE 1') ->will($this->returnValue('123'));