mirror of
https://github.com/vrana/adminer.git
synced 2025-08-06 22:56:46 +02:00
non-MySQL: Fix computing unique array
This commit is contained in:
@@ -389,10 +389,12 @@ if (!$columns && support("table")) {
|
|||||||
$unique_array = unique_array($rows[$n], $indexes);
|
$unique_array = unique_array($rows[$n], $indexes);
|
||||||
if (!$unique_array) {
|
if (!$unique_array) {
|
||||||
$unique_array = array();
|
$unique_array = array();
|
||||||
|
reset($select);
|
||||||
foreach ($rows[$n] as $key => $val) {
|
foreach ($rows[$n] as $key => $val) {
|
||||||
if (!preg_match('~^(COUNT\((\*|(DISTINCT )?`(?:[^`]|``)+`)\)|(AVG|GROUP_CONCAT|MAX|MIN|SUM)\(`(?:[^`]|``)+`\))$~', $key)) { //! columns looking like functions
|
if (!preg_match('~^(COUNT|AVG|GROUP_CONCAT|MAX|MIN|SUM)\(~', current($select))) {
|
||||||
$unique_array[$key] = $val;
|
$unique_array[$key] = $val;
|
||||||
}
|
}
|
||||||
|
next($select);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$unique_idf = "";
|
$unique_idf = "";
|
||||||
|
Reference in New Issue
Block a user