Merge pull request #62456 from nextcloud/backport/62425/stable33

[stable33] fix(background-jobs): preserve Snowflake IDs as strings

Author: AndyScherzinger

apps/dav/lib/BackgroundJob/UserStatusAutomation.php

@@ -89,7 +89,7 @@ protected function setLastRunToNextToggleTime(string $userId, int $timestamp): v
 
 		$query->update('jobs')
 			->set('last_run', $query->createNamedParameter($timestamp, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
+			->where($query->expr()->eq('id', $query->createNamedParameter($this->getId())));
 		$query->executeStatement();
 
 		$this->logger->debug('Updated user status automation last_run to ' . $timestamp . ' for user ' . $userId);

lib/private/BackgroundJob/JobList.php

@@ -112,7 +112,7 @@ public function remove(IJob|string $job, mixed $argument = null): void {
 	public function removeById(string $id): void {
 		$query = $this->connection->getQueryBuilder();
 		$query->delete('jobs')
-			->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+			->where($query->expr()->eq('id', $query->createNamedParameter($id)));
 		$query->executeStatement();
 	}
 
@@ -262,7 +262,7 @@ public function getNext(bool $onlyTimeSensitive = false, ?array $jobClasses = nu
 				$reset->update('jobs')
 					->set('reserved_at', $reset->expr()->literal(0, IQueryBuilder::PARAM_INT))
 					->set('last_checked', $reset->createNamedParameter($this->timeFactory->getTime() + 12 * 3600, IQueryBuilder::PARAM_INT))
-					->where($reset->expr()->eq('id', $reset->createNamedParameter($row['id'], IQueryBuilder::PARAM_INT)));
+					->where($reset->expr()->eq('id', $reset->createNamedParameter($row['id'])));
 				$reset->executeStatement();
 
 				// Background job from disabled app, try again.
@@ -354,7 +354,7 @@ public function unlockJob(IJob $job): void {
 		$query = $this->connection->getQueryBuilder();
 		$query->update('jobs')
 			->set('reserved_at', $query->expr()->literal(0, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
+			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId())));
 		$query->executeStatement();
 	}
 
@@ -379,7 +379,7 @@ public function setExecutionTime(IJob $job, $timeTaken): void {
 		$query->update('jobs')
 			->set('execution_duration', $query->createNamedParameter($timeTaken, IQueryBuilder::PARAM_INT))
 			->set('reserved_at', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId(), IQueryBuilder::PARAM_INT)));
+			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId())));
 		$query->executeStatement();
 	}
 
@@ -389,7 +389,7 @@ public function resetBackgroundJob(IJob $job): void {
 		$query->update('jobs')
 			->set('last_run', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
 			->set('reserved_at', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
-			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId()), IQueryBuilder::PARAM_INT));
+			->where($query->expr()->eq('id', $query->createNamedParameter($job->getId())));
 		$query->executeStatement();
 	}
 

tests/lib/BackgroundJob/JobListTest.php

@@ -272,6 +272,26 @@ public function testSetLastRun(): void {
 		$this->assertLessThanOrEqual($timeEnd, $addedJob->getLastRun());
 	}
 
+	public function testRemoveByIdWithSnowflakeId(): void {
+		$this->instance->add(new TestJob(), 'remove-by-id');
+		$job = $this->instance->getJobs(null, 1, 0)[0];
+
+		$this->instance->removeById($job->getId());
+
+		$this->assertNull($this->instance->getById($job->getId()));
+	}
+
+	public function testResetBackgroundJobWithSnowflakeId(): void {
+		$this->instance->add(new TestJob(), 'reset');
+		$job = $this->instance->getJobs(null, 1, 0)[0];
+
+		$this->instance->resetBackgroundJob($job);
+
+		$row = $this->instance->getDetailsById($job->getId());
+		$this->assertSame('0', (string)$row['last_run']);
+		$this->assertSame('0', (string)$row['reserved_at']);
+	}
+
 	public function testHasReservedJobs(): void {
 		$this->clearJobsList();