keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13126 from nupplaphil/bug/increment_db

Browse source 
Fixup incrementQueue
This commit is contained in:
Hypolite Petovan 2023-05-14 15:24:15 -04:00 committed by GitHub
commit 6e6814ef35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Model/Post/DeliveryData.php
View file

@ -86,19 +86,19 @@ class DeliveryData
switch ($protocol) { switch ($protocol) {
case self::ACTIVITYPUB: case self::ACTIVITYPUB:
$increments[] = ["`activitypub` = `activitypub` + 1"]; $increments[] = "`activitypub` = `activitypub` + 1";
break; break;
case self::DFRN: case self::DFRN:
$increments[] = ["`dfrn` = `dfrn` + 1"]; $increments[] = "`dfrn` = `dfrn` + 1";
break; break;
case self::LEGACY_DFRN: case self::LEGACY_DFRN:
$increments[] = ["`legacy_dfrn` = `legacy_dfrn` + 1"]; $increments[] = "`legacy_dfrn` = `legacy_dfrn` + 1";
break; break;
case self::DIASPORA: case self::DIASPORA:
$increments[] = ["`diaspora` = `diaspora` + 1"]; $increments[] = "`diaspora` = `diaspora` + 1";
break; break;
case self::OSTATUS: case self::OSTATUS:
$increments[] = ["`ostatus` = `ostatus` + 1"]; $increments[] = "`ostatus` = `ostatus` + 1";
break; break;
} }

15
tests/src/Database/DatabaseTest.php
View file

@ -85,4 +85,19 @@ class DatabaseTest extends FixtureTest
])); ]));
self::assertEquals(1, $db->selectFirst('gserver', ['registered-users'], ['nurl' => 'http://friendica.local'])['registered-users']); self::assertEquals(1, $db->selectFirst('gserver', ['registered-users'], ['nurl' => 'http://friendica.local'])['registered-users']);
} }
public function testUpdateWithArray()
{
$db = $this->getDbInstance();
self::assertTrue($db->update('gserver', ['active-week-users' => 0, 'registered-users' => 0], ['nurl' => 'http://friendica.local']));
$fields = ["`registered-users` = `registered-users` + 1"];
$fields[] = "`active-week-users` = `active-week-users` + 2";
self::assertTrue($db->update('gserver', $fields, ['nurl' => 'http://friendica.local']));
self::assertEquals(2, $db->selectFirst('gserver', ['active-week-users'], ['nurl' => 'http://friendica.local'])['active-week-users']);
self::assertEquals(1, $db->selectFirst('gserver', ['registered-users'], ['nurl' => 'http://friendica.local'])['registered-users']);
}
} }