From 4a5d2e072014a23f8276eebd08896a3fa2bc3cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 4 Dec 2013 09:22:40 +0100 Subject: [PATCH] Fixed test queries --- libraries/dbi/dummy.lib.php | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/libraries/dbi/dummy.lib.php b/libraries/dbi/dummy.lib.php index 66138bccff..cbb503d6ad 100644 --- a/libraries/dbi/dummy.lib.php +++ b/libraries/dbi/dummy.lib.php @@ -200,29 +200,50 @@ $GLOBALS['dummy_queries'] = array( 'result' => array(array(0)), ), array( - 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`USER_PRIVILEGES` WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\' AND PRIVILEGE_TYPE=\'TRIGGER\'', + 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.' + . '`USER_PRIVILEGES`' + . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\'' + . ' AND PRIVILEGE_TYPE=\'TRIGGER\'', 'result' => array(), ), array( - 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`SCHEMA_PRIVILEGES` WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\' AND PRIVILEGE_TYPE=\'TRIGGER\' AND TABLE_SCHEMA=\'pma\\\\_test\'', - + '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, \'_\', \'.\'), \'%\', \'.*\')', '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\'', + '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\'', 'result' => array(), ), array( - 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`USER_PRIVILEGES` WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\' AND PRIVILEGE_TYPE=\'EVENT\'', + 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.' + . '`USER_PRIVILEGES`' + . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\'' + . ' AND PRIVILEGE_TYPE=\'EVENT\'', 'result' => array(), ), array( - 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`SCHEMA_PRIVILEGES` WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\' AND PRIVILEGE_TYPE=\'EVENT\' AND TABLE_SCHEMA=\'pma\\\\_test\'', - + '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, \'_\', \'.\'), \'%\', \'.*\')', 'result' => array(), ), array( - 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`TABLE_PRIVILEGES` WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\' AND PRIVILEGE_TYPE=\'EVENT\' AND TABLE_SCHEMA=\'pma\\\\_test\' AND TABLE_NAME=\'table1\'', + 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.' + . '`TABLE_PRIVILEGES`' + . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\'' + . ' AND PRIVILEGE_TYPE=\'EVENT\'' + . ' AND TABLE_SCHEMA=\'pma\\\\_test\' AND TABLE_NAME=\'table1\'', 'result' => array(), ), array(