Skip to content

Port away from IQueryBuilder::execute in lib/ and tests/ and fix invalid usage of UniqueConstraintViolationException #54664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarlSchwan merged 4 commits into from
Sep 2, 2025
Merged

Port away from IQueryBuilder::execute in lib/ and tests/ and fix invalid usage of UniqueConstraintViolationException #54664

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c21b816
refactor(querybuilder): Port away from qb::execute() in lib/
Aug 26, 2025
c4e6fbd
fix(query-builder): Don't catch UniqueConstraintViolationException
Aug 26, 2025
9b2fff5
refactor(querybuilder): Port away from qb::execute() in tests/
Aug 26, 2025
996be0f
fix(comments): Don's catch invalid DriverException
Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix(comments): Don's catch invalid DriverException 
These are nowadays also OCP\DB\Exception and if the id is not a numeric
deleting by id is also non working.

Signed-off-by: Carl Schwan <[email protected]>
  • Loading branch information
@CarlSchwan
Carl Schwan authored and CarlSchwan committed Sep 2, 2025
commit 996be0f4411fdb2214c8b38445a245661bc871fd
17 changes: 9 additions & 8 deletions lib/private/Comments/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
*/
namespace OC\Comments;

use Doctrine\DBAL\Exception\DriverException;
use OCA\DAV\Connector\Sabre\File;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Comments\CommentsEvent;
use OCP\Comments\IComment;
Expand Down Expand Up @@ -876,20 +874,23 @@ public function delete($id) {

try {
$comment = $this->get($id);
} catch (\Exception $e) {
} catch (\Exception) {
// Ignore exceptions, we just don't fire a hook then
$comment = null;
}

if (!is_numeric($id)) {
return false;
}

$qb = $this->dbConn->getQueryBuilder();
$query = $qb->delete('comments')
->where($qb->expr()->eq('id', $qb->createParameter('id')))
->setParameter('id', $id);
->where($qb->expr()->eq('id', $qb->createNamedParameter((int)$id, IQueryBuilder::PARAM_INT)));

try {
$affectedRows = $query->executeStatement();
$this->uncache($id);
} catch (DriverException $e) {
} catch (Exception $e) {
$this->logger->error($e->getMessage(), [
'exception' => $e,
'app' => 'core_comments',
Expand Down Expand Up @@ -1332,7 +1333,7 @@ public function deleteReadMarksFromUser(IUser $user) {

try {
$affectedRows = $query->executeStatement();
} catch (DriverException $e) {
} catch (Exception $e) {
$this->logger->error($e->getMessage(), [
'exception' => $e,
'app' => 'core_comments',
Expand Down Expand Up @@ -1439,7 +1440,7 @@ public function deleteReadMarksOnObject($objectType, $objectId) {

try {
$affectedRows = $query->executeStatement();
} catch (DriverException $e) {
} catch (Exception $e) {
$this->logger->error($e->getMessage(), [
'exception' => $e,
'app' => 'core_comments',
Expand Down
Loading