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

* PostgreSQL/Addressbook: fix SQL error in addressbook by organisation and department

Browse Source
This commit is contained in:
Ralf Becker 2013-08-06 12:09:11 +00:00
parent 2526840c2c
commit ff536e6f1c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etemplate/inc/class.so_sql.inc.php
View File

@ -1143,7 +1143,8 @@ class so_sql
{
if ($col == '*')
{
$col = $columns[$n] = $this->table_name.'.*';
// MySQL does NOT allow to GROUP BY table.*
$col = $columns[$n] = $this->table_name.'.'.($this->db->Type == 'mysql' ? $this->autoinc_id : '*');
++$changes;
}
// only check columns and non-aggregate functions
@ -1157,7 +1158,7 @@ class so_sql
if (stripos($col, ' AS ')) list($col, $alias) = preg_split('/ +AS +/i', $col);
if (!in_array($col, $group_by_cols) && !in_array($alias, $group_by_cols))
{
$group_by_cols[] = $col;
$group_by_cols[] = $alias;
//error_log(__METHOD__."() col=$col, alias=$alias --> group_by_cols=".array2string($group_by_cols));
++$changes;
}