extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 09:53:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

* All apps/custom fields: fixed multiple identical rows, if custom fields where set (introduced in last package)

Browse Source 
r43160: fixed SQL error introduced by r43149: multiple identical rows
r43177: fixed DISTINCT leading to no data returned (eg. ctag in accounts-addressbook in eSync and CardDAV), DISTINCED added twice and not using so_sql_cf::search if no custom fields defined
This commit is contained in:
Ralf Becker 2013-07-23 13:54:20 +00:00
parent f38dd8722c
commit 5101eadd45
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -793,6 +793,7 @@ class so_sql
*/
function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
{
//error_log(__METHOD__.'('.array2string(array_combine(array_slice(array('criteria','only_keys','order_by','extra_cols','wildcard','empty','op','start','filter','join','need_full_no_count'), 0, count(func_get_args())), func_get_args())).')');
if ((int) $this->debug >= 4) echo "<p>so_sql::search(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
// if extending class or instanciator set columns to search, convert string criteria to array
@ -1292,8 +1293,14 @@ class so_sql
else
{
$cols = array();
foreach(is_array($only_keys) ? $only_keys : explode(',',str_replace(array('DISTINCT ','distinct '),'',$only_keys)) as $col)
$distinct_checked = false;
foreach(is_array($only_keys) ? $only_keys : explode(',', $only_keys) as $col)
{
if (!$distinct_checked)
{
if (stripos($col, 'DISTINCT ') === 0) $col = substr($col, 9);
$distinct_checked = true;
}
if (!$col || $col == '*' || $col == $this->table_name.'.*') // all columns
{
$cols = array_merge($cols,$this->db_cols);

29
etemplate/inc/class.so_sql_cf.inc.php
View File

@ -414,6 +414,11 @@ class so_sql_cf extends so_sql
*/
function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
{
//error_log(__METHOD__.'('.array2string(array_combine(array_slice(array('criteria','only_keys','order_by','extra_cols','wildcard','empty','op','start','filter','join','need_full_no_count'), 0, count(func_get_args())), func_get_args())).')');
if (!$this->customfields)
{
return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
}
if ($only_keys === false)
{
$only_keys = $this->table_name.'.*';
@ -486,7 +491,8 @@ class so_sql_cf extends so_sql
}
if ($cfcriteria && $op =='OR') $criteria[] = implode(' OR ',$cfcriteria);
}
if($only_keys === true) {
if($only_keys === true)
{
// Expand to keys here, so table_name can be prepended below
$only_keys = array_values($this->db_key_cols);
}
@ -540,7 +546,8 @@ class so_sql_cf extends so_sql
elseif (is_string($name) && $val!=null && in_array($name, $this->db_cols))
{
$extra_columns = $this->db->get_table_definitions($app, $this->extra_table);
if($extra_columns['fd'][array_search($name, $this->db_cols)]) {
if ($extra_columns['fd'][array_search($name, $this->db_cols)])
{
$filter[] = $this->db->expression($this->table_name,$this->table_name.'.',array(
array_search($name, $this->db_cols) => $val,
));
@ -613,8 +620,20 @@ class so_sql_cf extends so_sql
}
}
}
if (!empty($join) && !is_array($only_keys)) $only_keys = 'DISTINCT '.$only_keys; // otherwise join returns rows more then once
// add DISTINCT as by joining custom fields for search a row can be returned multiple times
if ($join && strpos($join, $this->extra_join) !== false)
{
if (is_array($only_keys))
{
$only_keys = array_values($only_keys);
$only_keys[0] = 'DISTINCT '.($only_keys[0] != $this->autoinc_id ? $only_keys[0] :
$this->table_name.'.'.$this->autoinc_id.' AS '.$this->autoinc_id);
}
else
{
$only_keys = 'DISTINCT '.$only_keys;
}
}
return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
}
@ -646,7 +665,7 @@ class so_sql_cf extends so_sql
}
// Add in custom field column, if it is not already there
if(!in_array($this->extra_table.'.'.$this->extra_value, $search_cols))
if($this->customfields && !in_array($this->extra_table.'.'.$this->extra_value, $search_cols))
{
$search_cols[] = $this->extra_table.'.'.$this->extra_value;
}