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

fix for bug #928: Distribution lists are not working with pgsql, thanks to Peter Eisentraut <peter_e-at-gmx.net>

Browse Source 
postgres requires that expressions in order by appear in the columns of a distinct select
This commit is contained in:
Ralf Becker 2007-06-24 09:20:35 +00:00
parent 1be4bf91d1
commit 313edf6eed
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addressbook/inc/class.socontacts_sql.inc.php
View File

@ -328,6 +328,12 @@ class socontacts_sql extends so_sql
$filter[] = $this->table_name.'.contact_owner='.(int)$filter['owner']; $filter[] = $this->table_name.'.contact_owner='.(int)$filter['owner'];
unset($filter['owner']); unset($filter['owner']);
} }
// postgres requires that expressions in order by appear in the columns of a distinct select
if ($this->db->Type != 'mysql' && preg_match("/(\w+<>'')/",$order_by,$matches))
{
if (!is_array($extra_cols)) $extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
$extra_cols[] = $matches[1];
}
} }
$rows =& parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count); $rows =& parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);