#19705602 fix problem when specified column has alias

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8337 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-04-26 07:11:04 +00:00
parent de414300a8
commit d4bb3ade9a
2 changed files with 24 additions and 6 deletions

View file

@ -1029,8 +1029,14 @@
{
$columns = array();
foreach($output->arg_columns as $col){
if(strpos($col,'"')===false && strpos($col,' ')===false) $columns[] = '"'.$col.'"';
else $columns[] = $col;
unset($tmpCol);
$tmpCol = explode('.', $col);
if(isset($tmpCol[1])) $col = $tmpCol[1];
if(strpos($col,'"')===false && strpos($col,' ')==false) $col = '"'.$col.'"';
if(isset($tmpCol[1])) $col = $tmpCol[0].'.'.$col;
$columns[] = $col;
}
$columns = join(',',$columns);
@ -1207,8 +1213,14 @@
{
$columns = array();
foreach($output->arg_columns as $col){
if(strpos($col,'"')===false) $columns[] = '"'.$col.'"';
else $columns[] = $col;
unset($tmpCol);
$tmpCol = explode('.', $col);
if(isset($tmpCol[1])) $col = $tmpCol[1];
if(strpos($col,'"')===false && strpos($col,' ')==false) $col = '"'.$col.'"';
if(isset($tmpCol[1])) $col = $tmpCol[0].'.'.$col;
$columns[] = $col;
}
$columns = join(',',$columns);

View file

@ -624,8 +624,14 @@
{
$columns = array();
foreach($output->arg_columns as $col){
if(strpos($col,'`')===false && strpos($col,' ')==false) $columns[] = '`'.$col.'`';
else $columns[] = $col;
unset($tmpCol);
$tmpCol = explode('.', $col);
if(isset($tmpCol[1])) $col = $tmpCol[1];
if(strpos($col,'`')===false && strpos($col,' ')==false) $col = '`'.$col.'`';
if(isset($tmpCol[1])) $col = $tmpCol[0].'.'.$col;
$columns[] = $col;
}
$columns = join(',',$columns);