gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix TransformationsTest::testGetMime on Windows

Browse Source 
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-02-22 16:08:46 +01:00
parent 6bf1309d12
commit 0c209702fa
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libraries/classes/Transformations.php
View File

@ -278,20 +278,20 @@ class Transformations
} else { } else {
$com_qry = "SELECT `column_name`, "; $com_qry = "SELECT `column_name`, ";
} }
$com_qry .= '`mimetype`, $com_qry .= '`mimetype`, '
`transformation`, . '`transformation`, '
`transformation_options`, . '`transformation_options`, '
`input_transformation`, . '`input_transformation`, '
`input_transformation_options` . '`input_transformation_options`'
FROM ' . Util::backquote($cfgRelation['db']) . '.' . ' FROM ' . Util::backquote($cfgRelation['db']) . '.'
. Util::backquote($cfgRelation['column_info']) . ' . Util::backquote($cfgRelation['column_info'])
WHERE `db_name` = \'' . $GLOBALS['dbi']->escapeString($db) . '\' . ' WHERE `db_name` = \'' . $GLOBALS['dbi']->escapeString($db) . '\''
AND `table_name` = \'' . $GLOBALS['dbi']->escapeString($table) . '\' . ' AND `table_name` = \'' . $GLOBALS['dbi']->escapeString($table) . '\''
AND ( `mimetype` != \'\'' . (! $strict ? ' . ' AND ( `mimetype` != \'\'' . (! $strict ?
OR `transformation` != \'\' ' OR `transformation` != \'\''
OR `transformation_options` != \'\' . ' OR `transformation_options` != \'\''
OR `input_transformation` != \'\' . ' OR `input_transformation` != \'\''
OR `input_transformation_options` != \'\'' : '') . ')'; . ' OR `input_transformation_options` != \'\'' : '') . ')';
$result = $GLOBALS['dbi']->fetchResult( $result = $GLOBALS['dbi']->fetchResult(
$com_qry, $com_qry,
'column_name', 'column_name',