From 9dd4e4ee30f04ed1a07ec41a596189d701f7f468 Mon Sep 17 00:00:00 2001 From: Stephane Bisson Date: Wed, 24 Aug 2016 12:56:49 -0400 Subject: [PATCH] Don't select echo_event.* Removed fetchByTypesAndPage since it is now unused Fixed fetchByPage to select simple * instead of echo_event.* Bug: T105890 Change-Id: I486f27501a649d5368305965d2cd012afe0915b2 --- includes/mapper/EventMapper.php | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/includes/mapper/EventMapper.php b/includes/mapper/EventMapper.php index c23179533..bc175d505 100644 --- a/includes/mapper/EventMapper.php +++ b/includes/mapper/EventMapper.php @@ -146,34 +146,6 @@ class EchoEventMapper extends EchoAbstractMapper { return $res; } - /** - * Fetch events of certain types associated with a page - * - * @param string[] $eventTypes - * @param int $pageId - * @return EchoEvent[] - */ - public function fetchByTypesAndPage( $eventTypes, $pageId ) { - $dbr = $this->dbFactory->getEchoDb( DB_SLAVE ); - $res = $dbr->select( - array( 'echo_event', 'echo_target_page' ), - array( 'echo_event.*' ), - array( - 'event_id=etp_event', - 'event_type' => $eventTypes, - 'etp_page' => $pageId, - ), - __METHOD__ - ); - - $data = array(); - foreach ( $res as $row ) { - $data[] = EchoEvent::newFromRow( $row ); - } - - return $data; - } - /** * Fetch events associated with a page * @@ -186,7 +158,7 @@ class EchoEventMapper extends EchoAbstractMapper { $dbr = $this->dbFactory->getEchoDb( DB_SLAVE ); $res = $dbr->select( array( 'echo_event', 'echo_target_page' ), - array( 'echo_event.*' ), + array( '*' ), array( 'etp_page' => $pageId ),