GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[DATABASE] Use time intervals in a SQL standard compliant way

Browse Source
This commit is contained in:
Alexei Sorokin 2019-09-11 09:58:13 +03:00
parent 11dabbe44d
commit 44f4c9374d
4 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/Nodeinfo/actions/nodeinfo_2_0.php
View File

@ -331,12 +331,12 @@ class Nodeinfo_2_0Action extends Action
SELECT COUNT(DISTINCT profile_id) AS active_users_count SELECT COUNT(DISTINCT profile_id) AS active_users_count
FROM ( FROM (
SELECT profile_id FROM notice SELECT profile_id FROM notice
WHERE notice.created >= (CURRENT_TIMESTAMP - INTERVAL {$days} DAY) AND notice.is_local = 1 WHERE notice.created >= (CURRENT_TIMESTAMP - INTERVAL '{$days}' DAY) AND notice.is_local = 1
UNION ALL UNION ALL
SELECT user_id FROM fave INNER JOIN {$userTable} ON fave.user_id = {$userTable}.id SELECT user_id FROM fave INNER JOIN {$userTable} ON fave.user_id = {$userTable}.id
WHERE fave.created >= (CURRENT_TIMESTAMP - INTERVAL {$days} DAY) WHERE fave.created >= (CURRENT_TIMESTAMP - INTERVAL '{$days}' DAY)
UNION ALL UNION ALL
SELECT id FROM {$userTable} WHERE {$userTable}.created >= (CURRENT_TIMESTAMP - INTERVAL {$days} DAY) SELECT id FROM {$userTable} WHERE {$userTable}.created >= (CURRENT_TIMESTAMP - INTERVAL '{$days}' DAY)
) AS source"; ) AS source";
$activeUsersCount = new DB_DataObject(); $activeUsersCount = new DB_DataObject();

2
plugins/OStatus/classes/FeedSub.php
View File

@ -366,7 +366,7 @@ class FeedSub extends Managed_DataObject
public static function renewalCheck() public static function renewalCheck()
{ {
$fs = new FeedSub(); $fs = new FeedSub();
$fs->whereAdd('sub_end IS NOT NULL AND sub_end < (CURRENT_TIMESTAMP + INTERVAL 1 DAY)'); $fs->whereAdd("sub_end IS NOT NULL AND sub_end < (CURRENT_TIMESTAMP + INTERVAL '1' DAY)");
// find can be both false and 0, depending on why nothing was found // find can be both false and 0, depending on why nothing was found
if (!$fs->find()) { if (!$fs->find()) {
throw new NoResultException($fs); throw new NoResultException($fs);

36
plugins/OStatus/scripts/rm_bad_feedsubs.php
View File

@ -1,21 +1,23 @@
#!/usr/bin/env php #!/usr/bin/env php
<?php <?php
/* // This file is part of GNU social - https://www.gnu.org/software/social
* StatusNet - a distributed open-source microblogging tool //
* Copyright (C) 2010 StatusNet, Inc. // 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
* This program is free software: you can redistribute it and/or modify // the Free Software Foundation, either version 3 of the License, or
* it under the terms of the GNU Affero General Public License as published by // (at your option) any later version.
* 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
* This program is distributed in the hope that it will be useful, // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* but WITHOUT ANY WARRANTY; without even the implied warranty of // GNU Affero General Public License for more details.
* 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/>.
* 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/>. /**
* @copyright 2010 StatusNet, Inc.
* @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
*/ */
/* /*
@ -53,7 +55,7 @@ echo "Looking for feed subscriptions with dirty no good huburis...\n";
$feedsub = new FeedSub(); $feedsub = new FeedSub();
$feedsub->sub_state = 'subscribe'; $feedsub->sub_state = 'subscribe';
$feedsub->whereAdd('created < DATE_SUB(NOW(), INTERVAL 1 HOUR)'); $feedsub->whereAdd("created < (CURRENT_TIMESTAMP - INTERVAL '1' HOUR)");
$feedsub->find(); $feedsub->find();
$cnt = 0; $cnt = 0;

16
scripts/resend_confirm_address.php
View File

@ -1,5 +1,19 @@
#!/usr/bin/env php #!/usr/bin/env php
<?php <?php
// 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/>.
define('INSTALLDIR', dirname(__DIR__)); define('INSTALLDIR', dirname(__DIR__));
define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public'); define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
@ -17,7 +31,7 @@ all lingering confirmations.
NOTE: You probably want to do something like this to your database first so NOTE: You probably want to do something like this to your database first so
only relatively fresh accounts get resent this: only relatively fresh accounts get resent this:
DELETE FROM confirm_address WHERE modified < DATE_SUB(NOW(), INTERVAL 1 month); DELETE FROM confirm_address WHERE modified < (CURRENT_TIMESTAMP - INTERVAL '1' MONTH);
Options: Options: