holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix SQL error in ranking caused by automatic added ambigous column which app code had already aliased "$table.$col AS $col"

Browse Source
This commit is contained in:
Ralf Becker 2020-07-31 13:38:46 +02:00
parent 8243f7934e
commit 26be32f33e
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/src/Storage/Base.php
View File

@ -946,7 +946,20 @@ class Base
if (is_array($colums) && ($key = array_search('*', $colums)) !== false) if (is_array($colums) && ($key = array_search('*', $colums)) !== false)
{ {
unset($colums[$key]); unset($colums[$key]);
$colums = array_merge($colums, array_keys($this->db_cols)); // don't add colums already existing incl. aliased colums (AS $name)
$as_columns = array_map(function($col)
{
$as = null;
list(, $as) = preg_split('/ +AS +/i', $col);
return empty($as) ? $col : $as;
}, $colums);
foreach(array_keys($this->db_cols) as $col)
{
if (!in_array($col, $colums) && !in_array($col, $as_columns))
{
$colums[] = $col;
}
}
} }
if (is_array($colums) && ($key = array_search($this->autoinc_id, $colums)) !== false) if (is_array($colums) && ($key = array_search($this->autoinc_id, $colums)) !== false)
{ {