diff --git a/src/Database/DBA.php b/src/Database/DBA.php index e730b298d..e29a94068 100644 --- a/src/Database/DBA.php +++ b/src/Database/DBA.php @@ -841,7 +841,7 @@ class DBA */ public static function deleteSleepingProcesses() { - return DI::dba()->delete(); + return DI::dba()->deleteSleepingProcesses(); } /** diff --git a/tests/src/Database/DatabaseTest.php b/tests/src/Database/DatabaseTest.php index e95d655f1..85c673f07 100644 --- a/tests/src/Database/DatabaseTest.php +++ b/tests/src/Database/DatabaseTest.php @@ -21,6 +21,9 @@ class DatabaseTest extends FixtureTest $this->configFileManager = new ConfigFileManager($this->root->url(), $this->root->url() . '/config/', $this->root->url() . '/static/'); } + /** + * Test, if directly updating a field is possible + */ public function testUpdateIncrease() { $db = $this->getDbInstance(); @@ -30,13 +33,18 @@ class DatabaseTest extends FixtureTest self::assertEquals(1, $db->selectFirst('config', ['v'], ['cat' => 'test', 'k' => 'inc'])['v']); } + /** + * Test if combining directly field updates with normal updates is working + */ public function testUpdateWithField() { $db = $this->getDbInstance(); self::assertEquals('https://friendica.local', $db->selectFirst('gserver', ['url'], ['nurl' => 'http://friendica.local'])['url']); - self::assertTrue($db->update('gserver', ['site_name' => 'test', "`registered-users` = `registered-users` + 1", 'info' => 'another test'], ['nurl' => 'http://friendica.local'])); + self::assertTrue($db->update('gserver', ['active-week-users' => 0], ['nurl' => 'http://friendica.local'])); + self::assertTrue($db->update('gserver', ['site_name' => 'test', "`registered-users` = `registered-users` + 1", 'info' => 'another test', "`active-week-users` = `active-week-users` + 2"], ['nurl' => 'http://friendica.local'])); self::assertEquals(1, $db->selectFirst('gserver', ['registered-users'], ['nurl' => 'http://friendica.local'])['registered-users']); + self::assertEquals(2, $db->selectFirst('gserver', ['active-week-users'], ['nurl' => 'http://friendica.local'])['active-week-users']); self::assertTrue($db->update('gserver', ['site_name' => 'test', "`registered-users` = `registered-users` + 1", 'info' => 'another test'], ['nurl' => 'http://friendica.local'])); self::assertEquals(2, $db->selectFirst('gserver', ['registered-users'], ['nurl' => 'http://friendica.local'])['registered-users']); self::assertTrue($db->update('gserver', ['site_name' => 'test', "`registered-users` = `registered-users` - 1", 'info' => 'another test'], ['nurl' => 'http://friendica.local']));