jenkins-bot has submitted this change and it was merged.
Change subject: Fix fatal DB exception
......................................................................
Fix fatal DB exception
Follow-up I6c956738, which started trying to pull notification_timestamp out
of nowhere. Although EchoEvent::newFromRow may try to use this if it's set, it
wasn't previously getting selected and this is now causing exceptions.
Bug: T105890
Change-Id: I2dd9e268428d651813d8c43d85d54fc97634cd41
---
M includes/mapper/EventMapper.php
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/mapper/EventMapper.php b/includes/mapper/EventMapper.php
index cd7ad5b..69db509 100644
--- a/includes/mapper/EventMapper.php
+++ b/includes/mapper/EventMapper.php
@@ -79,8 +79,7 @@
$res = $dbr->select(
array( 'echo_notification', 'echo_event' ),
array( 'event_agent_id', 'event_agent_ip',
'event_extra',
- 'event_id', 'event_page_id',
'event_type', 'event_variant',
- 'notification_timestamp' ),
+ 'event_id', 'event_page_id',
'event_type', 'event_variant' ),
array(
'notification_event=event_id',
'notification_user' => $user->getId(),
@@ -95,8 +94,7 @@
$res = $dbr->select(
array( 'echo_email_batch', 'echo_event' ),
array( 'event_agent_id', 'event_agent_ip',
'event_extra',
- 'event_id', 'event_page_id',
'event_type', 'event_variant',
- 'notification_timestamp' ),
+ 'event_id', 'event_page_id',
'event_type', 'event_variant' ),
array(
'eeb_event_id=event_id',
'eeb_user_id' => $user->getId(),
--
To view, visit https://gerrit.wikimedia.org/r/233964
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2dd9e268428d651813d8c43d85d54fc97634cd41
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
