diff options
| author | brunoais <brunoaiss@gmail.com> | 2015-02-25 07:54:31 +0000 |
|---|---|---|
| committer | brunoais <brunoaiss@gmail.com> | 2015-03-16 11:13:50 +0000 |
| commit | b54adaaabed7546254ff8317763214cce3a40237 (patch) | |
| tree | 164cdc6d1522a172d4b14339f16864cdd5f07067 /phpBB/phpbb/db/driver/driver.php | |
| parent | 5c77e4381945300ba9a1086b99fac12ae48c52a8 (diff) | |
| download | forums-b54adaaabed7546254ff8317763214cce3a40237.tar forums-b54adaaabed7546254ff8317763214cce3a40237.tar.gz forums-b54adaaabed7546254ff8317763214cce3a40237.tar.bz2 forums-b54adaaabed7546254ff8317763214cce3a40237.tar.xz forums-b54adaaabed7546254ff8317763214cce3a40237.zip | |
[feature/sql-bool-builder] Removed non-necessary spaces
PHPBB3-13652
Diffstat (limited to 'phpBB/phpbb/db/driver/driver.php')
| -rw-r--r-- | phpBB/phpbb/db/driver/driver.php | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php index 5822adceab..cdff6bf9de 100644 --- a/phpBB/phpbb/db/driver/driver.php +++ b/phpBB/phpbb/db/driver/driver.php @@ -792,11 +792,11 @@ abstract class driver implements driver_interface return $sql; } - - + + protected function _process_boolean_tree_first($operations_ary) { - if ($operations_ary[0] !== 'AND' && + if ($operations_ary[0] !== 'AND' && $operations_ary[0] !== 'OR') { $operations_ary = array('AND', $operations_ary); @@ -807,71 +807,71 @@ abstract class driver implements driver_interface protected function _process_boolean_tree($operations_ary) { $operation = array_shift($operations_ary); - + foreach ($operations_ary AS &$condition) { switch ($condition[0]) { case 'AND': case 'OR': - + $condition = ' ( ' . $this->_process_boolean_tree($condition) . ') '; - + break; case 'NOT': - + $condition = ' NOT ' . $this->_process_boolean_tree($condition); - + break; - + default: - + switch (sizeof($condition)) { case 3: - + // Typical 3 element clause with {left hand} {operator} {right hand} switch ($condition[1]) - { + { case 'IN': case 'NOT_IN': - + // As this is used with an IN, assume it is a set of elements for sql_in_set() $condition = $this->sql_in_set($condition[0], $condition[2], $condition[1] === 'NOT_IN', true); - + break; - + default: - + $condition = implode(' ', $condition); - + break; } - + break; - + case 5: - + // Subquery with {left hand} {operator} {compare kind} {SELECT Kind } {Sub Query} - + $condition = $condition[0] . ' ' . $condition[1] . ' ' . $condition[2] . ' ( '; $condition .= $this->sql_build_query($condition[3], $condition[4]); $condition .= ' )'; - + break; - + default: // This is an unpredicted clause setup. Just join all elements. $condition = implode(' ', $condition); - + break; } - + break; } - + } - + if($operation === 'NOT') { $operations_ary = implode("", $operations_ary); @@ -880,10 +880,10 @@ abstract class driver implements driver_interface { $operations_ary = implode(" \n $operation ", $operations_ary); } - + return $operations_ary; } - + /** * {@inheritDoc} |