Database::makeList() : Handle NULL when building 'IN' clause

[lhc/web/wiklou.git] / tests / phpunit / includes / db / DatabaseSQLTest.php

diff --git a/tests/phpunit/includes/db/DatabaseSQLTest.php b/tests/phpunit/includes/db/DatabaseSQLTest.php
index 5c2d4b7..b13751f 100644 (file)
--- a/tests/phpunit/includes/db/DatabaseSQLTest.php
+++ b/tests/phpunit/includes/db/DatabaseSQLTest.php
@@ -722,4 +722,84 @@ class DatabaseSQLTest extends MediaWikiTestCase {
                        $this->database->dropTable( 'non_existing', __METHOD__ )
                );
        }
+
+       /**
+        * @dataProvider provideMakeList
+        * @covers DatabaseBase::makeList
+        */
+       public function testMakeList( $list, $mode, $sqlText ) {
+               $this->assertEquals( trim( $this->database->makeList(
+                       $list, $mode
+               ) ), $sqlText );
+       }
+
+       public static function provideMakeList() {
+               return array(
+                       array(
+                               array( 'value', 'value2' ),
+                               LIST_COMMA,
+                               "'value','value2'"
+                       ),
+                       array(
+                               array( 'field', 'field2' ),
+                               LIST_NAMES,
+                               "field,field2"
+                       ),
+                       array(
+                               array( 'field' => 'value', 'field2' => 'value2' ),
+                               LIST_AND,
+                               "field = 'value' AND field2 = 'value2'"
+                       ),
+                       array(
+                               array( 'field' => null, "field2 != 'value2'" ),
+                               LIST_AND,
+                               "field IS NULL AND (field2 != 'value2')"
+                       ),
+                       array(
+                               array( 'field' => array( 'value', null, 'value2' ), 'field2' => 'value2' ),
+                               LIST_AND,
+                               "(field IN ('value','value2')  OR field IS NULL) AND field2 = 'value2'"
+                       ),
+                       array(
+                               array( 'field' => array( null ), 'field2' => null ),
+                               LIST_AND,
+                               "field IS NULL AND field2 IS NULL"
+                       ),
+                       array(
+                               array( 'field' => 'value', 'field2' => 'value2' ),
+                               LIST_OR,
+                               "field = 'value' OR field2 = 'value2'"
+                       ),
+                       array(
+                               array( 'field' => 'value', 'field2' => null ),
+                               LIST_OR,
+                               "field = 'value' OR field2 IS NULL"
+                       ),
+                       array(
+                               array( 'field' => array( 'value', 'value2' ), 'field2' => array( 'value' ) ),
+                               LIST_OR,
+                               "field IN ('value','value2')  OR field2 = 'value'"
+                       ),
+                       array(
+                               array( 'field' => array( null, 'value', null, 'value2' ), "field2 != 'value2'" ),
+                               LIST_OR,
+                               "(field IN ('value','value2')  OR field IS NULL) OR (field2 != 'value2')"
+                       ),
+                       array(
+                               array( 'field' => 'value', 'field2' => 'value2' ),
+                               LIST_SET,
+                               "field = 'value',field2 = 'value2'"
+                       ),
+                       array(
+                               array( 'field' => 'value', 'field2' => null ),
+                               LIST_SET,
+                               "field = 'value',field2 = NULL"
+                       ),
+                       array(
+                               array( 'field' => 'value', "field2 != 'value2'" ),
+                               LIST_SET,
+                               "field = 'value',field2 != 'value2'"
+                       ),
+               );
+       }
 }