X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Flibs%2Frdbms%2Fdatabase%2FDatabaseSQLTest.php;h=d73983955e8c125b74c846ef751b9b8c7611d8ac;hb=cff7dac346df3baf88cf3004f81011f09d43fed4;hp=4488d9e9fe9d71bbba3c06dfaa9f2f08677e4bb1;hpb=a4120368bb7797df25004613feed9406eac1c9d0;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
index 4488d9e9fe..d73983955e 100644
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
@@ -311,8 +311,8 @@ class DatabaseSQLTest extends PHPUnit\Framework\TestCase {
 	/**
 	 * @covers Wikimedia\Rdbms\Subquery
 	 * @dataProvider provideSelectRowCount
-	 * @param $sql
-	 * @param $sqlText
+	 * @param array $sql
+	 * @param string $sqlText
 	 */
 	public function testSelectRowCount( $sql, $sqlText ) {
 		$this->database->selectRowCount(
@@ -740,6 +740,10 @@ class DatabaseSQLTest extends PHPUnit\Framework\TestCase {
 		];
 	}
 
+	/**
+	 * @covers Wikimedia\Rdbms\Database::insertSelect
+	 * @covers Wikimedia\Rdbms\Database::nativeInsertSelect
+	 */
 	public function testInsertSelectBatching() {
 		$dbWeb = new DatabaseTestHelper( __CLASS__, [ 'cliMode' => false ] );
 		$rows = [];
@@ -1874,6 +1878,7 @@ class DatabaseSQLTest extends PHPUnit\Framework\TestCase {
 
 	/**
 	 * @expectedException \Wikimedia\Rdbms\DBTransactionStateError
+	 * @covers \Wikimedia\Rdbms\Database::assertTransactionStatus
 	 */
 	public function testTransactionErrorState1() {
 		$wrapper = TestingAccessWrapper::newFromObject( $this->database );
@@ -2139,4 +2144,21 @@ class DatabaseSQLTest extends PHPUnit\Framework\TestCase {
 		$this->assertLastSql( 'BEGIN; SELECT 1; ROLLBACK' );
 		$this->assertEquals( 0, $this->database->trxLevel() );
 	}
+
+	/**
+	 * @covers Wikimedia\Rdbms\Database::selectFieldValues()
+	 */
+	public function testSelectFieldValues() {
+		$this->database->forceNextResult( [
+			(object)[ 'value' => 'row1' ],
+			(object)[ 'value' => 'row2' ],
+			(object)[ 'value' => 'row3' ],
+		] );
+
+		$this->assertSame(
+			[ 'row1', 'row2', 'row3' ],
+			$this->database->selectFieldValues( 'table', 'table.field', 'conds', __METHOD__ )
+		);
+		$this->assertLastSql( 'SELECT table.field AS value FROM table WHERE conds' );
+	}
 }