fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 18:51:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Improvements for query classes.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9102 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ucorina 2011-09-07 17:10:40 +00:00
parent f1c9668478
commit 78db12a858
6 changed files with 88 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

85
classes/db/queryparts/Query.class.php
View file

@ -48,8 +48,18 @@
}
function setColumnList($columnList){
if(count($columnList) > 0)
$this->columnList = $columnList;
if(count($this->columnList) > 0) {
$selectColumns = array();
$dbParser = XmlQueryParser::getDBParser();
foreach($this->columnList as $columnName){
$columnName = $dbParser->escapeColumn($columnName);
$selectColumns[] = new SelectExpression($columnName);
}
unset($this->columns);
$this->columns = $selectColumns;
}
}
function setColumns($columns){
@ -76,10 +86,13 @@
}
function setConditions($conditions){
if(!isset($conditions) || count($conditions) === 0) return;
if(!is_array($conditions)) $conditions = array($conditions);
$this->conditions = array();
if(!isset($conditions) || count($conditions) === 0) return;
if(!is_array($conditions)) $conditions = array($conditions);
$this->conditions = $conditions;
foreach($conditions as $conditionGroup){
if($conditionGroup->show()) $this->conditions[] = $conditionGroup;
}
}
function setGroups($groups){
@ -139,34 +152,23 @@
}
function getSelectString($with_values = true){
if(isset($this->columnList)){
$selectColumns = array();
$dbParser = XmlQueryParser::getDBParser();
foreach($this->columnList as $columnName){
$columnName = $dbParser->escapeColumn($columnName);
$selectColumns[] = new SelectExpression($columnName);
}
}
else
$selectColumns = $this->columns;
$select = '';
foreach($selectColumns as $column){
if($column->show())
if(is_a($column, 'Subquery')){
$select .= $column->toString($with_values) . ' as '. $column->getAlias() .', ';
}
else
$select .= $column->getExpression($with_values) . ', ';
}
if(trim($select) == '') return '';
$select = substr($select, 0, -2);
return $select;
foreach($this->columns as $column){
if($column->show())
if($column->isSubquery()){
$select[] = $column->toString($with_values) . ' as '. $column->getAlias();
}
else
$select[] = $column->getExpression($with_values);
}
return trim(implode($select, ', '));
}
function getUpdateString($with_values = true){
return $this->getSelectString($with_values);
foreach($this->columns as $column){
if($column->show())
$update[] = $column->getExpression($with_values);
}
return trim(implode($update, ', '));
}
function getInsertString($with_values = true){
@ -209,21 +211,16 @@
function getWhereString($with_values = true){
$where = '';
if(count($this->conditions) > 0){
$condition_count = 0;
foreach($this->conditions as $conditionGroup){
$condition_string = $conditionGroup->toString($with_values);
if($condition_string !== '') $condition_count++;
if($condition_count === 1){
$conditionGroup->setPipe("");
$condition_string = $conditionGroup->toString($with_values);
}
$where .= $condition_string;
}
if(trim($where) == '') return '';
}
return $where;
$condition_count = 0;
foreach($this->conditions as $conditionGroup){
if($condition_count === 0){
$conditionGroup->setPipe("");
}
$condition_string = $conditionGroup->toString($with_values);
$where .= $condition_string;
$condition_count++;
}
return trim($where);
}
function getGroupByString(){