From fe668e138f5db9b2dec8df079fa6433698d3fa5b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 27 Nov 2013 13:08:51 -0500 Subject: [PATCH] Fix tests --- libraries/dbi/DBIDummy.class.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libraries/dbi/DBIDummy.class.php b/libraries/dbi/DBIDummy.class.php index c7ad6fb129..c9d2eed70c 100644 --- a/libraries/dbi/DBIDummy.class.php +++ b/libraries/dbi/DBIDummy.class.php @@ -312,16 +312,17 @@ $GLOBALS['dummy_queries'] = array( 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.' . '`SCHEMA_PRIVILEGES`' . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\'' - . ' AND PRIVILEGE_TYPE=\'TRIGGER\'' - . ' AND TABLE_SCHEMA=\'pma\\\\_test\'', + . ' AND PRIVILEGE_TYPE=\'TRIGGER\' AND \'pma\\\\_test\'' + . ' REGEXP REPLACE(REPLACE(TABLE_SCHEMA, \'_\', \'.\'), \'%\', \'.*\')', 'result' => array(), ), array( 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.' . '`TABLE_PRIVILEGES`' . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\'' - . ' AND PRIVILEGE_TYPE=\'TRIGGER\'' - . ' AND TABLE_SCHEMA=\'pma\\\\_test\' AND TABLE_NAME=\'table1\'', + . ' AND PRIVILEGE_TYPE=\'TRIGGER\' AND \'pma\\\\_test\'' + . ' REGEXP REPLACE(REPLACE(TABLE_SCHEMA, \'_\', \'.\'), \'%\', \'.*\')' + . ' AND TABLE_NAME=\'table1\'', 'result' => array(), ), array( @@ -335,8 +336,8 @@ $GLOBALS['dummy_queries'] = array( 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.' . '`SCHEMA_PRIVILEGES`' . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\'' - . ' AND PRIVILEGE_TYPE=\'EVENT\' AND TABLE_SCHEMA=\'pma\\\\_test\'', - + . ' AND PRIVILEGE_TYPE=\'EVENT\' AND \'pma\\\\_test\'' + . ' REGEXP REPLACE(REPLACE(TABLE_SCHEMA, \'_\', \'.\'), \'%\', \'.*\')', 'result' => array(), ), array(