diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
| commit | 6dc1997577fab2c366781fd7048144935afa0012 (patch) | |
| tree | 8918d28c7ab4342f0738985e37af1dfc42d0e93a /includes/api/ApiQueryAllPages.php | |
| parent | 150f94f051128f367bc89f6b7e5f57eb2a69fc62 (diff) | |
| parent | fa89acd685cb09cdbe1c64cbb721ec64975bbbc1 (diff) | |
Merge commit 'fa89acd'
# Conflicts:
# .gitignore
# extensions/ArchInterWiki.sql
Diffstat (limited to 'includes/api/ApiQueryAllPages.php')
| -rw-r--r-- | includes/api/ApiQueryAllPages.php | 12 |
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 |