fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 12:02:24 +09:00
Code Issues Projects Releases Packages Wiki Activity

r8032 누락추가

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@8034 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2011-01-20 06:21:14 +00:00
parent 3056eebd23
commit fdab40757a
1 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

41
classes/db/DBMysql_innodb.class.php
View file

@ -534,7 +534,7 @@
$left_join = array(); $left_join = array();
// why??? // why???
$left_tables= (array)$output->left_tables; f(!$output->columns) $output->columns = array('*');$left_tables= (array)$output->left_tables;
foreach($left_tables as $key => $val) { foreach($left_tables as $key => $val) {
$condition = $this->_getCondition($output->left_conditions[$key],$output->column_type); $condition = $this->_getCondition($output->left_conditions[$key],$output->column_type);
@ -543,27 +543,26 @@
} }
} }
if(!$output->columns) { $click_count = array();
$columns = '*'; if(!$output->columns) $output->columns = array('*');
} else {
$column_list = array();
foreach($output->columns as $key => $val) {
$name = $val['name'];
$alias = $val['alias'];
if($val['click_count']) $click_count[] = $val['name'];
if(substr($name,-1) == '*') { $column_list = array();
$column_list[] = $name; foreach($output->columns as $key => $val) {
} elseif(strpos($name,'.')===false && strpos($name,'(')===false) { $name = $val['name'];
if($alias) $column_list[] = sprintf('`%s` as `%s`', $name, $alias); $alias = $val['alias'];
else $column_list[] = sprintf('`%s`',$name); if($val['click_count']) $click_count[] = $val['name'];
} else {
if($alias) $column_list[] = sprintf('%s as `%s`', $name, $alias); if(substr($name,-1) == '*') {
else $column_list[] = sprintf('%s',$name); $column_list[] = $name;
} } elseif(strpos($name,'.')===false && strpos($name,'(')===false) {
} if($alias) $column_list[] = sprintf('`%s` as `%s`', $name, $alias);
$columns = implode(',',$column_list); else $column_list[] = sprintf('`%s`',$name);
} } else {
if($alias) $column_list[] = sprintf('%s as `%s`', $name, $alias);
else $column_list[] = sprintf('%s',$name);
}
}
$columns = implode(',',$column_list);
$condition = $this->getCondition($output); $condition = $this->getCondition($output);