diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-12-05 11:23:27 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-12-05 11:23:27 +0100 |
| commit | ecb98ce81ff7e176ff7a8b652ea208b59f483108 (patch) | |
| tree | 5240d2f3dd891b36e62c7aba33f1982056c77d6a /tests/dbal/boolean_processor_test.php | |
| parent | b4bbc7056aed232dc7056103094843da8bfc2da2 (diff) | |
| parent | a3a163dea1c3ba23a1d3a1c80c4c63c6831c37df (diff) | |
| download | forums-ecb98ce81ff7e176ff7a8b652ea208b59f483108.tar forums-ecb98ce81ff7e176ff7a8b652ea208b59f483108.tar.gz forums-ecb98ce81ff7e176ff7a8b652ea208b59f483108.tar.bz2 forums-ecb98ce81ff7e176ff7a8b652ea208b59f483108.tar.xz forums-ecb98ce81ff7e176ff7a8b652ea208b59f483108.zip | |
Merge pull request #4006 from brunoais/feature/sql-bool-builder
[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
Diffstat (limited to 'tests/dbal/boolean_processor_test.php')
| -rw-r--r-- | tests/dbal/boolean_processor_test.php | 58 |
1 files changed, 38 insertions, 20 deletions
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', ); |