flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nerzhul/ocsms.git synced 2025-06-08 00:16:24 +00:00
Code Issues Releases Wiki Activity

Fix all the delete functions

Browse Source
This commit is contained in:
Loic Blot 2018-05-17 10:29:42 +02:00
parent 6566f73a51
commit 14fefaeedd
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
db/smsmapper.php
View File

@ -230,8 +230,7 @@ class SmsMapper extends Mapper {
public function removeMessagesForPhoneNumber ($userId, $phoneNumber) { public function removeMessagesForPhoneNumber ($userId, $phoneNumber) {
$this->db->beginTransaction(); $this->db->beginTransaction();
$qb = $this->db->getQueryBuilder(); $qb = $this->db->getQueryBuilder();
$qb->delete() $qb->delete('ocsms_smsdatas')
->from('ocsms_smsdatas')
->where($qb->expr()->andX( ->where($qb->expr()->andX(
$qb->expr()->eq('user_id', $qb->createNamedParameter($userId)), $qb->expr()->eq('user_id', $qb->createNamedParameter($userId)),
$qb->expr()->eq('sms_address', $qb->createNamedParameter($phoneNumber)) $qb->expr()->eq('sms_address', $qb->createNamedParameter($phoneNumber))
@ -247,8 +246,7 @@ class SmsMapper extends Mapper {
public function removeMessage ($userId, $phoneNumber, $messageId) { public function removeMessage ($userId, $phoneNumber, $messageId) {
$this->db->beginTransaction(); $this->db->beginTransaction();
$qb = $this->db->getQueryBuilder(); $qb = $this->db->getQueryBuilder();
$qb->delete() $qb->delete('ocsms_smsdatas')
->from('ocsms_smsdatas')
->where($qb->expr()->andX( ->where($qb->expr()->andX(
$qb->expr()->eq('user_id', $qb->createNamedParameter($userId)), $qb->expr()->eq('user_id', $qb->createNamedParameter($userId)),
$qb->expr()->eq('sms_address', $qb->createNamedParameter($phoneNumber)), $qb->expr()->eq('sms_address', $qb->createNamedParameter($phoneNumber)),
@ -315,8 +313,7 @@ class SmsMapper extends Mapper {
$qb = $this->db->getQueryBuilder(); $qb = $this->db->getQueryBuilder();
if ($purgeAllSmsBeforeInsert === true) { if ($purgeAllSmsBeforeInsert === true) {
$qb->delete() $qb->delete('ocsms_smsdatas')
->from('ocsms_smsdatas')
->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)) ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId))
); );
$qb->execute(); $qb->execute();
@ -331,8 +328,7 @@ class SmsMapper extends Mapper {
// Only delete if we haven't purged the DB // Only delete if we haven't purged the DB
if ($purgeAllSmsBeforeInsert === false) { if ($purgeAllSmsBeforeInsert === false) {
// Remove previous record // Remove previous record
$qb->delete() $qb->delete('ocsms_smsdatas')
->from('ocsms_smsdatas')
->where($qb->expr()->andX( ->where($qb->expr()->andX(
$qb->expr()->eq('user_id', $qb->createNamedParameter($userId)), $qb->expr()->eq('user_id', $qb->createNamedParameter($userId)),
$qb->expr()->eq('sms_id', $qb->createNamedParameter((int) $sms["_id"])) $qb->expr()->eq('sms_id', $qb->createNamedParameter((int) $sms["_id"]))