From 01d6a06c5294cd71f503fbdd64b41d06b7558bc9 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 7 Oct 2014 19:33:25 +0530 Subject: [PATCH] Update Dummy DBI for tests Signed-off-by: Madhura Jayaratne --- libraries/dbi/DBIDummy.class.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libraries/dbi/DBIDummy.class.php b/libraries/dbi/DBIDummy.class.php index 393c4ed9b0..51c34c6d33 100644 --- a/libraries/dbi/DBIDummy.class.php +++ b/libraries/dbi/DBIDummy.class.php @@ -312,17 +312,16 @@ $GLOBALS['dummy_queries'] = array( 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.' . '`SCHEMA_PRIVILEGES`' . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\'' - . ' AND PRIVILEGE_TYPE=\'TRIGGER\' AND \'pma\\\\_test\'' - . ' REGEXP REPLACE(REPLACE(TABLE_SCHEMA, \'_\', \'.\'), \'%\', \'.*\')', + . ' AND PRIVILEGE_TYPE=\'TRIGGER\' AND \'pma_test\'' + . ' LIKE `TABLE_SCHEMA`', 'result' => array(), ), array( 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.' . '`TABLE_PRIVILEGES`' . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\'' - . ' AND PRIVILEGE_TYPE=\'TRIGGER\' AND \'pma\\\\_test\'' - . ' REGEXP REPLACE(REPLACE(TABLE_SCHEMA, \'_\', \'.\'), \'%\', \'.*\')' - . ' AND TABLE_NAME=\'table1\'', + . ' AND PRIVILEGE_TYPE=\'TRIGGER\' AND \'pma_test\'' + . ' LIKE `TABLE_SCHEMA` AND TABLE_NAME=\'table1\'', 'result' => array(), ), array( @@ -336,8 +335,8 @@ $GLOBALS['dummy_queries'] = array( 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.' . '`SCHEMA_PRIVILEGES`' . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\'' - . ' AND PRIVILEGE_TYPE=\'EVENT\' AND \'pma\\\\_test\'' - . ' REGEXP REPLACE(REPLACE(TABLE_SCHEMA, \'_\', \'.\'), \'%\', \'.*\')', + . ' AND PRIVILEGE_TYPE=\'EVENT\' AND \'pma_test\'' + . ' LIKE `TABLE_SCHEMA`', 'result' => array(), ), array(