Merge branch 'mw-1.26'

1 files changed, 8 insertions, 4 deletions

diff --git a/includes/api/ApiQueryAllPages.php b/includes/api/ApiQueryAllPages.php
index 0149ad2f..e441991a 100644
--- a/includes/api/ApiQueryAllPages.php
+++ b/includes/api/ApiQueryAllPages.php
@@ -175,10 +175,14 @@ class ApiQueryAllPages extends ApiQueryGeneratorBase {
 			// 1999 rules works fine, but that breaks other DBs. Sigh.
 			/// @todo Once we drop support for 1992-rule DBs, we can simplify this.
 			$dbType = $db->getType();
-			if ( $dbType === 'mysql' || $dbType === 'sqlite' ||
-				$dbType === 'postgres' && $db->getServerVersion() >= 9.1
-			) {
-				// 1999 rules, or screw-the-rules
+			if ( $dbType === 'mysql' || $dbType === 'sqlite' ) {
+				// Ignore the rules, or 1999 rules if you count unique keys
+				// over non-NULL columns as satisfying the requirement for
+				// "functional dependency" and don't require including
+				// constant-in-WHERE columns in the GROUP BY.
+				$this->addOption( 'GROUP BY', array( 'page_title' ) );
+			} elseif ( $dbType === 'postgres' && $db->getServerVersion() >= 9.1 ) {
+				// 1999 rules only counting primary keys
 				$this->addOption( 'GROUP BY', array( 'page_title', 'page_id' ) );
 			} else {
 				// 1992 rules