extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 20:31:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

"read: prefix column with table-name, if used in join, to prevent ambigous col-name"

Browse Source
This commit is contained in:
Ralf Becker 2007-02-14 07:07:58 +00:00
parent cb42383e47
commit 6ffdbb01a1
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,6 +324,15 @@ class so_sql
return False; return False;
} }
if ($join) // Prefix the columns with the table-name, as they might exist in the join
{
foreach($query as $col => $val)
{
if (is_int($col) || strstr($join,$col) === false) continue;
$query[] = $this->db->expression($this->table_name,$this->table_name.'.',array($col=>$val));
unset($query[$col]);
}
}
$this->db->select($this->table_name,'*'.($extra_cols?','.(is_array($extra_cols)?implode(',',$extra_cols):$extra_cols):''), $this->db->select($this->table_name,'*'.($extra_cols?','.(is_array($extra_cols)?implode(',',$extra_cols):$extra_cols):''),
$query,__LINE__,__FILE__,False,'',False,0,$join); $query,__LINE__,__FILE__,False,'',False,0,$join);
@ -785,6 +794,7 @@ class so_sql
{ {
$criteria[$col] = $query['search']; $criteria[$col] = $query['search'];
} }
_debug_array($criteria);
} }
$rows = (array) $this->search($criteria,false,$query['order']?$query['order'].' '.$query['sort']:'', $rows = (array) $this->search($criteria,false,$query['order']?$query['order'].' '.$query['sort']:'',
'','%',false,'OR',(int)$query['start'],$query['col_filter'],$join,$need_full_no_count); '','%',false,'OR',(int)$query['start'],$query['col_filter'],$join,$need_full_no_count);