From 062352e312402820fd081a702c599a10c610e888 Mon Sep 17 00:00:00 2001 From: brunoais Date: Sun, 25 Oct 2015 17:22:40 +0000 Subject: [feature/sql-bool-builder] Changing syntax pt2. Fix tests PHPBB3-13652 --- tests/dbal/boolean_processor_test.php | 58 +++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 20 deletions(-) (limited to 'tests') diff --git a/tests/dbal/boolean_processor_test.php b/tests/dbal/boolean_processor_test.php index 8662485ac8..226f5307b2 100644 --- a/tests/dbal/boolean_processor_test.php +++ b/tests/dbal/boolean_processor_test.php @@ -162,17 +162,25 @@ class phpbb_boolean_processor_test extends phpbb_database_test_case ), ), 'WHERE' => array('AND', - array('OR', - array('AND', - array('ug.user_id', 'IN', array(1, 2, 3, 4)), - array('ug.group_id', '=', 2), - ), - array('AND', - array('ug.group_id', '=', 1), - array('b.ban_id', 'IS_NOT', NULL), + array( + array('OR', + array( + array('AND', + array( + array('ug.user_id', 'IN', array(1, 2, 3, 4)), + array('ug.group_id', '=', 2), + ), + ), + 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', ); @@ -204,9 +212,11 @@ class phpbb_boolean_processor_test extends phpbb_database_test_case 'phpbb_user_group' => 'ug', ), 'WHERE' => array('AND', - array('ug.user_id', 'IN', array(1, 2, 3, 4)), - array('ug.group_id', '=', 1), - array('u.user_id', '=', 'ug.user_id'), + array( + array('ug.user_id', 'IN', array(1, 2, 3, 4)), + array('ug.group_id', '=', 1), + array('u.user_id', '=', 'ug.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', ), 'WHERE' => array('AND', - array('NOT', - array('OR', - array('ug.group_id', '=', 1), - array('ug.group_id', '=', 2), + array( + array('NOT', + array( + 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', ); @@ -283,9 +299,11 @@ class phpbb_boolean_processor_test extends phpbb_database_test_case ), ), 'WHERE' => array('AND', - array('ug.group_id', '=', 1), - array('u.user_id', '=', 'ug.user_id'), - array('b.ban_id', 'IS', NULL), + array( + array('ug.group_id', '=', 1), + array('u.user_id', '=', 'ug.user_id'), + array('b.ban_id', 'IS', NULL), + ), ), 'ORDER_BY' => 'u.username', ); -- cgit v1.2.1