makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/sql-bool-builder] Changing syntax pt2. Fix tests

Browse source 
PHPBB3-13652
This commit is contained in:
brunoais 2015-10-25 17:22:40 +00:00
parent bb260f02e0
commit 062352e312
1 changed files with 38 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tests/dbal/boolean_processor_test.php
View file

@ -162,18 +162,26 @@ class phpbb_boolean_processor_test extends phpbb_database_test_case
), ),
), ),
'WHERE' => array('AND', 'WHERE' => array('AND',
array(
array('OR', array('OR',
array(
array('AND', array('AND',
array(
array('ug.user_id', 'IN', array(1, 2, 3, 4)), array('ug.user_id', 'IN', array(1, 2, 3, 4)),
array('ug.group_id', '=', 2), array('ug.group_id', '=', 2),
), ),
),
array('AND', array('AND',
array(
array('ug.group_id', '=', 1), array('ug.group_id', '=', 1),
array('b.ban_id', 'IS_NOT', NULL), 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',
); );
$sql = $db->sql_build_query('SELECT', $sql_ary); $sql = $db->sql_build_query('SELECT', $sql_ary);
@ -204,10 +212,12 @@ 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(
array('ug.user_id', 'IN', array(1, 2, 3, 4)), array('ug.user_id', 'IN', array(1, 2, 3, 4)),
array('ug.group_id', '=', 1), array('ug.group_id', '=', 1),
array('u.user_id', '=', 'ug.user_id'), array('u.user_id', '=', 'ug.user_id'),
), ),
),
'ORDER_BY' => 'u.user_id', 'ORDER_BY' => 'u.user_id',
); );
$sql = $db->sql_build_query('SELECT', $sql_ary); $sql = $db->sql_build_query('SELECT', $sql_ary);
@ -240,14 +250,20 @@ 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(
array('NOT', array('NOT',
array(
array('OR', array('OR',
array(
array('ug.group_id', '=', 1), array('ug.group_id', '=', 1),
array('ug.group_id', '=', 2), 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',
); );
$sql = $db->sql_build_query('SELECT', $sql_ary); $sql = $db->sql_build_query('SELECT', $sql_ary);
@ -283,10 +299,12 @@ class phpbb_boolean_processor_test extends phpbb_database_test_case
), ),
), ),
'WHERE' => array('AND', 'WHERE' => array('AND',
array(
array('ug.group_id', '=', 1), array('ug.group_id', '=', 1),
array('u.user_id', '=', 'ug.user_id'), array('u.user_id', '=', 'ug.user_id'),
array('b.ban_id', 'IS', NULL), array('b.ban_id', 'IS', NULL),
), ),
),
'ORDER_BY' => 'u.username', 'ORDER_BY' => 'u.username',
); );
$sql = $db->sql_build_query('SELECT', $sql_ary); $sql = $db->sql_build_query('SELECT', $sql_ary);