Merge pull request #13126 from nupplaphil/bug/increment_db
Fixup incrementQueue
This commit is contained in:
commit
6e6814ef35
2 changed files with 20 additions and 5 deletions
|
@ -86,19 +86,19 @@ class DeliveryData
|
|||
|
||||
switch ($protocol) {
|
||||
case self::ACTIVITYPUB:
|
||||
$increments[] = ["`activitypub` = `activitypub` + 1"];
|
||||
$increments[] = "`activitypub` = `activitypub` + 1";
|
||||
break;
|
||||
case self::DFRN:
|
||||
$increments[] = ["`dfrn` = `dfrn` + 1"];
|
||||
$increments[] = "`dfrn` = `dfrn` + 1";
|
||||
break;
|
||||
case self::LEGACY_DFRN:
|
||||
$increments[] = ["`legacy_dfrn` = `legacy_dfrn` + 1"];
|
||||
$increments[] = "`legacy_dfrn` = `legacy_dfrn` + 1";
|
||||
break;
|
||||
case self::DIASPORA:
|
||||
$increments[] = ["`diaspora` = `diaspora` + 1"];
|
||||
$increments[] = "`diaspora` = `diaspora` + 1";
|
||||
break;
|
||||
case self::OSTATUS:
|
||||
$increments[] = ["`ostatus` = `ostatus` + 1"];
|
||||
$increments[] = "`ostatus` = `ostatus` + 1";
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -85,4 +85,19 @@ class DatabaseTest extends FixtureTest
|
|||
]));
|
||||
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']);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue