extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-11 08:28:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

only join in extra table, if we really need it, to improve performance

Browse Source
This commit is contained in:
Ralf Becker 2014-06-30 09:05:16 +00:00
parent 609e909eef
commit d8b35e0a77
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -437,8 +437,6 @@ class so_sql_cf extends so_sql
} }
if ($criteria && is_array($criteria)) if ($criteria && is_array($criteria))
{ {
$join .= $this->extra_join;
// check if we search in the custom fields // check if we search in the custom fields
if (isset($criteria[$this->extra_value])) if (isset($criteria[$this->extra_value]))
{ {
@ -462,8 +460,15 @@ class so_sql_cf extends so_sql
unset($criteria[$this->autoinc_id]); unset($criteria[$this->autoinc_id]);
} }
// replace ambiguous column with (an exact match of) table_name.column // replace ambiguous column with (an exact match of) table_name.column
$extra_join_added = $join && strpos($join, $this->extra_join) !== false;
foreach($criteria as $name => $val) foreach($criteria as $name => $val)
{ {
// only add extra_join, if we really need it
if (!$extra_join_added && is_int($name) && strpos($val, $this->extra_value) !== false)
{
$join .= $this->extra_join;
$extra_join_added = true;
}
$extra_columns = $this->db->get_table_definitions($this->app, $this->extra_table); $extra_columns = $this->db->get_table_definitions($this->app, $this->extra_table);
if(is_string($name) && $extra_columns['fd'][array_search($name, $this->db_cols)]) if(is_string($name) && $extra_columns['fd'][array_search($name, $this->db_cols)])
{ {