From 14fefaeedd408dfec25e83d716718feb9ba6df04 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Thu, 17 May 2018 10:29:42 +0200 Subject: [PATCH] Fix all the delete functions --- db/smsmapper.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/db/smsmapper.php b/db/smsmapper.php index d4e8ea7..19ab5e2 100644 --- a/db/smsmapper.php +++ b/db/smsmapper.php @@ -230,8 +230,7 @@ class SmsMapper extends Mapper { public function removeMessagesForPhoneNumber ($userId, $phoneNumber) { $this->db->beginTransaction(); $qb = $this->db->getQueryBuilder(); - $qb->delete() - ->from('ocsms_smsdatas') + $qb->delete('ocsms_smsdatas') ->where($qb->expr()->andX( $qb->expr()->eq('user_id', $qb->createNamedParameter($userId)), $qb->expr()->eq('sms_address', $qb->createNamedParameter($phoneNumber)) @@ -247,8 +246,7 @@ class SmsMapper extends Mapper { public function removeMessage ($userId, $phoneNumber, $messageId) { $this->db->beginTransaction(); $qb = $this->db->getQueryBuilder(); - $qb->delete() - ->from('ocsms_smsdatas') + $qb->delete('ocsms_smsdatas') ->where($qb->expr()->andX( $qb->expr()->eq('user_id', $qb->createNamedParameter($userId)), $qb->expr()->eq('sms_address', $qb->createNamedParameter($phoneNumber)), @@ -315,8 +313,7 @@ class SmsMapper extends Mapper { $qb = $this->db->getQueryBuilder(); if ($purgeAllSmsBeforeInsert === true) { - $qb->delete() - ->from('ocsms_smsdatas') + $qb->delete('ocsms_smsdatas') ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)) ); $qb->execute(); @@ -331,8 +328,7 @@ class SmsMapper extends Mapper { // Only delete if we haven't purged the DB if ($purgeAllSmsBeforeInsert === false) { // Remove previous record - $qb->delete() - ->from('ocsms_smsdatas') + $qb->delete('ocsms_smsdatas') ->where($qb->expr()->andX( $qb->expr()->eq('user_id', $qb->createNamedParameter($userId)), $qb->expr()->eq('sms_id', $qb->createNamedParameter((int) $sms["_id"]))