Merge "rdbms: make select() warn when FOR UPDATE is used with aggregation"

[lhc/web/wiklou.git] / tests / phpunit / includes / libs / rdbms / database / DatabaseSQLTest.php

diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
index cf10801..3d15b03 100644 (file)
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseSQLTest.php
@@ -46,6 +46,8 @@ class DatabaseSQLTest extends PHPUnit\Framework\TestCase {
         * @covers Wikimedia\Rdbms\Database::makeSelectOptions
         * @covers Wikimedia\Rdbms\Database::makeOrderBy
         * @covers Wikimedia\Rdbms\Database::makeGroupByWithHaving
+        * @covers Wikimedia\Rdbms\Database::selectFieldsOrOptionsAggregate
+        * @covers Wikimedia\Rdbms\Database::selectOptionsIncludeLocking
         */
        public function testSelect( $sql, $sqlText ) {
                $this->database->select(
@@ -223,9 +225,17 @@ class DatabaseSQLTest extends PHPUnit\Framework\TestCase {
                                [
                                        'tables' => 'table',
                                        'fields' => [ 'field' ],
-                                       'options' => [ 'DISTINCT', 'LOCK IN SHARE MODE' ],
+                                       'options' => [ 'DISTINCT' ],
                                ],
-                               "SELECT DISTINCT field FROM table      LOCK IN SHARE MODE"
+                               "SELECT DISTINCT field FROM table"
+                       ],
+                       [
+                               [
+                                       'tables' => 'table',
+                                       'fields' => [ 'field' ],
+                                       'options' => [ 'LOCK IN SHARE MODE' ],
+                               ],
+                               "SELECT field FROM table      LOCK IN SHARE MODE"
                        ],
                        [
                                [