mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases 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
parent b4bbc7056a a3a163dea1
commit ecb98ce81f
2 changed files with 64 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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