Skip to content

Commit fe668e1

Browse files
author
Marc Delisle
committed
Fix tests
1 parent 20770f3 commit fe668e1

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

libraries/dbi/DBIDummy.class.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -312,16 +312,17 @@
312312
'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
313313
. '`SCHEMA_PRIVILEGES`'
314314
. ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
315-
. ' AND PRIVILEGE_TYPE=\'TRIGGER\''
316-
. ' AND TABLE_SCHEMA=\'pma\\\\_test\'',
315+
. ' AND PRIVILEGE_TYPE=\'TRIGGER\' AND \'pma\\\\_test\''
316+
. ' REGEXP REPLACE(REPLACE(TABLE_SCHEMA, \'_\', \'.\'), \'%\', \'.*\')',
317317
'result' => array(),
318318
),
319319
array(
320320
'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
321321
. '`TABLE_PRIVILEGES`'
322322
. ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
323-
. ' AND PRIVILEGE_TYPE=\'TRIGGER\''
324-
. ' AND TABLE_SCHEMA=\'pma\\\\_test\' AND TABLE_NAME=\'table1\'',
323+
. ' AND PRIVILEGE_TYPE=\'TRIGGER\' AND \'pma\\\\_test\''
324+
. ' REGEXP REPLACE(REPLACE(TABLE_SCHEMA, \'_\', \'.\'), \'%\', \'.*\')'
325+
. ' AND TABLE_NAME=\'table1\'',
325326
'result' => array(),
326327
),
327328
array(
@@ -335,8 +336,8 @@
335336
'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
336337
. '`SCHEMA_PRIVILEGES`'
337338
. ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
338-
. ' AND PRIVILEGE_TYPE=\'EVENT\' AND TABLE_SCHEMA=\'pma\\\\_test\'',
339-
339+
. ' AND PRIVILEGE_TYPE=\'EVENT\' AND \'pma\\\\_test\''
340+
. ' REGEXP REPLACE(REPLACE(TABLE_SCHEMA, \'_\', \'.\'), \'%\', \'.*\')',
340341
'result' => array(),
341342
),
342343
array(

0 commit comments

Comments
 (0)