[DATABASE] Columns not in GROUP BY must not be queried
This commit is contained in:
@@ -1,21 +1,23 @@
|
||||
#!/usr/bin/env php
|
||||
<?php
|
||||
/*
|
||||
* StatusNet - a distributed open-source microblogging tool
|
||||
* Copyright (C) 2008, 2009, StatusNet, Inc.
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
// This file is part of GNU social - https://www.gnu.org/software/social
|
||||
//
|
||||
// GNU social is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Affero General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// GNU social is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Affero General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Affero General Public License
|
||||
// along with GNU social. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
/**
|
||||
* @copyright 2008, 2009 StatusNet, Inc.
|
||||
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
|
||||
*/
|
||||
|
||||
define('INSTALLDIR', dirname(__DIR__));
|
||||
@@ -44,7 +46,7 @@ if (!have_option('y', 'yes')) {
|
||||
}
|
||||
|
||||
$file = new File();
|
||||
$file->query('SELECT id, url, COUNT(*) AS c FROM file GROUP BY url HAVING c > 1');
|
||||
$file->query('SELECT url FROM file GROUP BY url HAVING COUNT(*) > 1');
|
||||
print "\nFound {$file->N} URLs with duplicate entries in file table";
|
||||
while ($file->fetch()) {
|
||||
// We've got a URL that is duplicated in the file table
|
||||
@@ -54,7 +56,7 @@ while ($file->fetch()) {
|
||||
print "\nDeleting duplicate entries in file table for URL: {$file->url} [";
|
||||
// Leave one of the URLs in the database by using ->find(true)
|
||||
// and only deleting starting with this fetch.
|
||||
while($dupfile->fetch()) {
|
||||
while ($dupfile->fetch()) {
|
||||
print ".";
|
||||
$dupfile->delete();
|
||||
}
|
||||
@@ -65,7 +67,7 @@ while ($file->fetch()) {
|
||||
}
|
||||
|
||||
$file = new File_redirection();
|
||||
$file->query('SELECT file_id, url, COUNT(*) AS c FROM file_redirection GROUP BY url HAVING c > 1');
|
||||
$file->query('SELECT url FROM file_redirection GROUP BY url HAVING COUNT(*) > 1');
|
||||
print "\nFound {$file->N} URLs with duplicate entries in file_redirection table";
|
||||
while ($file->fetch()) {
|
||||
// We've got a URL that is duplicated in the file_redirection table
|
||||
@@ -75,7 +77,7 @@ while ($file->fetch()) {
|
||||
print "\nDeleting duplicate entries in file table for URL: {$file->url} [";
|
||||
// Leave one of the URLs in the database by using ->find(true)
|
||||
// and only deleting starting with this fetch.
|
||||
while($dupfile->fetch()) {
|
||||
while ($dupfile->fetch()) {
|
||||
print ".";
|
||||
$dupfile->delete();
|
||||
}
|
||||
|
Reference in New Issue
Block a user