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

PHPBB3-13652
This commit is contained in:
brunoais 2015-10-25 17:22:40 +00:00
parent bb260f02e0
commit 062352e312

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',
); );