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

Updated Condition query part class to make code more readable and reduce calls to ->hasArgument().

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9035 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ucorina 2011-09-05 17:00:08 +00:00
parent 833dcfae37
commit 3f8d72b537
7 changed files with 92 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

35
classes/db/queryparts/condition/Condition.class.php
View file

@ -8,29 +8,14 @@
var $_value;
function Condition($column_name, $argument, $operation, $pipe = ""){
function Condition($column_name, $argument, $operation, $pipe){
$this->column_name = $column_name;
$this->argument = $argument;
$this->operation = $operation;
$this->pipe = $pipe;
if($this->hasArgument())
$this->_value = $argument->getValue();
else if(is_a($this->argument, 'Subquery'))
$this->_value = $argument->toString();
else {
if(in_array($operation, array('in', 'not in')))
$this->_value = '('. $argument .')';
else
$this->_value = $argument;
}
}
function hasArgument(){
return is_a($this->argument, 'Argument');
}
function getArgument(){
if($this->hasArgument()) return $this->argument;
return null;
}
@ -42,19 +27,7 @@
}
function toStringWithoutValue(){
if($this->hasArgument()){
$value = $this->argument->getUnescapedValue();
if(is_array($value)){
$q = '';
foreach ($value as $v) $q .= '?,';
if($q !== '') $q = substr($q, 0, -1);
$q = '(' . $q . ')';
}
else $q = '?';
return $this->pipe . ' ' . $this->getConditionPart($q);
}
else return $this->toString();
return $this->argument;
}
function toStringWithValue(){
@ -66,8 +39,6 @@
}
function show(){
if($this->hasArgument() && !$this->argument->isValid()) return false;
if($this->hasArgument() && ($this->_value === '\'\'')) return false;
if(is_array($this->_value) && count($this->_value) === 1 && $this->_value[0] === '') return false;
switch($this->operation) {
case 'equal' :
@ -91,7 +62,7 @@
if(count($this->_value)!=2) return false;
}
return true;
return true;
}
function getConditionPart($value) {