makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 05:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4006 from brunoais/feature/sql-bool-builder

Browse source 
[feature/sql-bool-builder] New syntax for DBAL query builder for boolean generation

* brunoais/feature/sql-bool-builder:
  [feature/sql-bool-builder] Fixing misuse of LOGICAL_OP instead of STATEMENTS
  [feature/sql-bool-builder] Fixing typos in previous commit
  [feature/sql-bool-builder] Changing syntax pt3. Don't use magic numbers
  [feature/sql-bool-builder] Changing syntax pt2. Fix tests
  [feature/sql-bool-builder] Changing syntax
This commit is contained in:
Tristan Darricau 2015-12-05 11:23:27 +01:00
commit ecb98ce81f
2 changed files with 64 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
phpBB/phpbb/db/driver/driver.php
View file

@ -66,6 +66,15 @@ abstract class driver implements driver_interface
*/ */
var $sql_server_version = false; var $sql_server_version = false;
const LOGICAL_OP = 0;
const STATEMENTS = 1;
const LEFT_STMT = 0;
const COMPARE_OP = 1;
const RIGHT_STMT = 2;
const SUBQUERY_OP = 3;
const SUBQUERY_SELECT_TYPE = 4;
const SUBQUERY_BUILD = 5;
/** /**
* Constructor * Constructor
*/ */
@ -809,21 +818,21 @@ abstract class driver implements driver_interface
{ {
// In cases where an array exists but there is no head condition, // In cases where an array exists but there is no head condition,
// it should be because there's only 1 WHERE clause. This seems the best way to deal with it. // it should be because there's only 1 WHERE clause. This seems the best way to deal with it.
if ($operations_ary[0] !== 'AND' && if ($operations_ary[self::LOGICAL_OP] !== 'AND' &&
$operations_ary[0] !== 'OR') $operations_ary[self::LOGICAL_OP] !== 'OR')
{ {
$operations_ary = array('AND', $operations_ary); $operations_ary = array('AND', array($operations_ary));
} }
return $this->_process_boolean_tree($operations_ary) . "\n"; return $this->_process_boolean_tree($operations_ary) . "\n";
} }
protected function _process_boolean_tree($operations_ary) protected function _process_boolean_tree($operations_ary)
{ {
$operation = array_shift($operations_ary); $operation = $operations_ary[self::LOGICAL_OP];
foreach ($operations_ary as &$condition) foreach ($operations_ary[self::STATEMENTS] as &$condition)
{ {
switch ($condition[0]) switch ($condition[self::LOGICAL_OP])
{ {
case 'AND': case 'AND':
case 'OR': case 'OR':
@ -844,40 +853,40 @@ abstract class driver implements driver_interface
case 3: case 3:
// Typical 3 element clause with {left hand} {operator} {right hand} // Typical 3 element clause with {left hand} {operator} {right hand}
switch ($condition[1]) switch ($condition[self::COMPARE_OP])
{ {
case 'IN': case 'IN':
case 'NOT_IN': case 'NOT_IN':
// As this is used with an IN, assume it is a set of elements for sql_in_set() // 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); $condition = $this->sql_in_set($condition[self::LEFT_STMT], $condition[self::RIGHT_STMT], $condition[self::COMPARE_OP] === 'NOT_IN', true);
break; break;
case 'LIKE': case 'LIKE':
$condition = $condition[0] . ' ' . $this->sql_like_expression($condition[2]) . ' '; $condition = $condition[self::LEFT_STMT] . ' ' . $this->sql_like_expression($condition[self::RIGHT_STMT]) . ' ';
break; break;
case 'NOT_LIKE': case 'NOT_LIKE':
$condition = $condition[0] . ' ' . $this->sql_not_like_expression($condition[2]) . ' '; $condition = $condition[self::LEFT_STMT] . ' ' . $this->sql_not_like_expression($condition[self::RIGHT_STMT]) . ' ';
break; break;
case 'IS_NOT': case 'IS_NOT':
$condition[1] = 'IS NOT'; $condition[self::COMPARE_OP] = 'IS NOT';
// no break // no break
case 'IS': case 'IS':
// If the value is NULL, the string of it is the empty string ('') which is not the intended result. // If the value is NULL, the string of it is the empty string ('') which is not the intended result.
// this should solve that // this should solve that
if ($condition[2] === null) if ($condition[self::RIGHT_STMT] === null)
{ {
$condition[2] = 'NULL'; $condition[self::RIGHT_STMT] = 'NULL';
} }
$condition = implode(' ', $condition); $condition = implode(' ', $condition);
@ -897,8 +906,8 @@ abstract class driver implements driver_interface
// Subquery with {left hand} {operator} {compare kind} {SELECT Kind } {Sub Query} // Subquery with {left hand} {operator} {compare kind} {SELECT Kind } {Sub Query}
$condition = $condition[0] . ' ' . $condition[1] . ' ' . $condition[2] . ' ( '; $condition = $condition[self::LEFT_STMT] . ' ' . $condition[self::COMPARE_OP] . ' ' . $condition[self::SUBQUERY_OP] . ' ( ';
$condition .= $this->sql_build_query($condition[3], $condition[4]); $condition .= $this->sql_build_query($condition[self::SUBQUERY_SELECT_TYPE], $condition[self::SUBQUERY_BUILD]);
$condition .= ' )'; $condition .= ' )';
break; break;
@ -917,11 +926,11 @@ abstract class driver implements driver_interface
if ($operation === 'NOT') if ($operation === 'NOT')
{ {
$operations_ary = implode("", $operations_ary); $operations_ary = implode("", $operations_ary[self::STATEMENTS]);
} }
else else
{ {
$operations_ary = implode(" \n $operation ", $operations_ary); $operations_ary = implode(" \n $operation ", $operations_ary[self::STATEMENTS]);
} }
return $operations_ary; return $operations_ary;

58
tests/dbal/boolean_processor_test.php
View file

@ -162,17 +162,25 @@ class phpbb_boolean_processor_test extends phpbb_database_test_case
), ),
), ),
'WHERE' => array('AND', 'WHERE' => array('AND',
array('OR', array(
array('AND', array('OR',
array('ug.user_id', 'IN', array(1, 2, 3, 4)), array(
array('ug.group_id', '=', 2), array('AND',
), array(
array('AND', array('ug.user_id', 'IN', array(1, 2, 3, 4)),
array('ug.group_id', '=', 1), array('ug.group_id', '=', 2),
array('b.ban_id', 'IS_NOT', NULL), ),
),
array('AND',
array(
array('ug.group_id', '=', 1),
array('b.ban_id', 'IS_NOT', NULL),
),
),
),
), ),
array('u.user_id', '=', 'ug.user_id'),
), ),
array('u.user_id', '=', 'ug.user_id'),
), ),
'ORDER_BY' => 'u.user_id', 'ORDER_BY' => 'u.user_id',
); );
@ -204,9 +212,11 @@ class phpbb_boolean_processor_test extends phpbb_database_test_case
'phpbb_user_group' => 'ug', 'phpbb_user_group' => 'ug',
), ),
'WHERE' => array('AND', 'WHERE' => array('AND',
array('ug.user_id', 'IN', array(1, 2, 3, 4)), array(
array('ug.group_id', '=', 1), array('ug.user_id', 'IN', array(1, 2, 3, 4)),
array('u.user_id', '=', 'ug.user_id'), array('ug.group_id', '=', 1),
array('u.user_id', '=', 'ug.user_id'),
),
), ),
'ORDER_BY' => 'u.user_id', 'ORDER_BY' => 'u.user_id',
); );
@ -240,13 +250,19 @@ class phpbb_boolean_processor_test extends phpbb_database_test_case
'phpbb_user_group' => 'ug', 'phpbb_user_group' => 'ug',
), ),
'WHERE' => array('AND', 'WHERE' => array('AND',
array('NOT', array(
array('OR', array('NOT',
array('ug.group_id', '=', 1), array(
array('ug.group_id', '=', 2), array('OR',
array(
array('ug.group_id', '=', 1),
array('ug.group_id', '=', 2),
),
),
),
), ),
array('u.user_id', '=', 'ug.user_id'),
), ),
array('u.user_id', '=', 'ug.user_id'),
), ),
'ORDER_BY' => 'u.user_id', 'ORDER_BY' => 'u.user_id',
); );
@ -283,9 +299,11 @@ class phpbb_boolean_processor_test extends phpbb_database_test_case
), ),
), ),
'WHERE' => array('AND', 'WHERE' => array('AND',
array('ug.group_id', '=', 1), array(
array('u.user_id', '=', 'ug.user_id'), array('ug.group_id', '=', 1),
array('b.ban_id', 'IS', NULL), array('u.user_id', '=', 'ug.user_id'),
array('b.ban_id', 'IS', NULL),
),
), ),
'ORDER_BY' => 'u.username', 'ORDER_BY' => 'u.username',
); );