fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 19:21:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

r8032 추가 보완

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@8043 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2011-01-21 07:25:20 +00:00
parent 0974954690
commit 4b8bf1ea80
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
classes/db/DBCubrid.class.php
View file

@ -814,7 +814,6 @@
foreach ($output->tables as $key => $val) {
$table_list[] = '"'.$this->prefix.$val.'" as "'.$key.'"';
}
$left_join = array ();
// why???
$left_tables = (array) $output->left_tables;
@ -841,6 +840,7 @@
}
$alias = $val['alias'] ? sprintf ('"%s"', $val['alias']) : null;
$_alias = $val['alias'];
if ($name == '*') {
$column_list[] = $name;
@ -873,7 +873,7 @@
}
$xtmp = null;
$now_matchs = null;
if($alias) $column_list[$val['alias]']] = sprintf ($click_count, sprintf ('%s.%s', $prefix, $name)) . ($alias ? sprintf (' as %s',$alias) : '');
if($alias) $column_list[$_alias] = sprintf ($click_count, sprintf ('%s.%s', $prefix, $name)) . ($alias ? sprintf (' as %s',$alias) : '');
else $column_list[] = sprintf ($click_count, sprintf ('%s.%s', $prefix, $name));
}
elseif (($now_matchs = preg_match_all ("/\(/", $name, $xtmp)) > 0) {
@ -899,11 +899,11 @@
}
}
if($alias) $column_list[$val['alias']] = sprintf ($click_count, $name). ($alias ? sprintf (' as %s', $alias) : '');
if($alias) $column_list[$_alias] = sprintf ($click_count, $name). ($alias ? sprintf (' as %s', $alias) : '');
else $column_list[] = sprintf ($click_count, $name);
}
else {
if($alias) $column_list[$val['alias']] = sprintf($click_count, $name). ($alias ? sprintf(' as %s',$alias) : '');
if($alias) $column_list[$_alias] = sprintf($click_count, $name). ($alias ? sprintf(' as %s',$alias) : '');
else $column_list[] = sprintf($click_count, $name);
}
}
@ -1015,11 +1015,12 @@
}
}
if(count($output->arg_columns))
{
$columns = array();
foreach($output->arg_columns as $col){
if(strpos($col,'"')===false) $columns[] = '"'.$col.'"';
if(strpos($col,'"')===false && strpos($col,' ')===false) $columns[] = '"'.$col.'"';
else $columns[] = $col;
}
@ -1027,7 +1028,6 @@
}
$query = sprintf ("select %s from %s %s %s %s", $columns, implode (',',$table_list), implode (' ',$left_join), $condition, $groupby_query.$orderby_query);
$query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
$result = $this->_query ($query);
if ($this->isError ()) return;