Skip to content

Commit 8da1a2a

Browse files
refactor: replace usage of removed db query builder method
Signed-off-by: Christoph Wurst <[email protected]>
1 parent 2e3f776 commit 8da1a2a

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

lib/Db/LoginAddressAggregatedMapper.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function hasSufficientIpV4Data(int $start): bool {
5353
$qb->expr()->lte('first_seen', $qb->createNamedParameter($start))
5454
));
5555

56-
$result = $query->execute();
56+
$result = $query->executeQuery();
5757
$count = (int)$result->fetchColumn();
5858
$result->closeCursor();
5959

@@ -111,7 +111,7 @@ public function hasSufficientIpV6Data(int $start) {
111111
$qb->expr()->lte('first_seen', $qb->createNamedParameter($start))
112112
));
113113

114-
$result = $query->execute();
114+
$result = $query->executeQuery();
115115
$count = (int)$result->fetchColumn();
116116
$result->closeCursor();
117117

@@ -123,7 +123,7 @@ public function getCount(): int {
123123

124124
$qb->select($qb->createFunction('COUNT(*)'))
125125
->from($this->getTableName());
126-
$result = $qb->execute();
126+
$result = $qb->executeQuery();
127127
$cnt = $result->fetchColumn();
128128
$result->closeCursor();
129129

@@ -135,7 +135,7 @@ public function getTotalCount(): int {
135135

136136
$qb->select($qb->createFunction('SUM(seen)'))
137137
->from($this->getTableName());
138-
$result = $qb->execute();
138+
$result = $qb->executeQuery();
139139
$cnt = $result->fetchColumn();
140140
$result->closeCursor();
141141

lib/Db/LoginAddressMapper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function getCount(): int {
2525

2626
$qb->select($qb->createFunction('COUNT(*)'))
2727
->from($this->getTableName());
28-
$result = $qb->execute();
28+
$result = $qb->executeQuery();
2929
$cnt = $result->fetchColumn();
3030
$result->closeCursor();
3131

lib/Service/ETLService.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ private function getRaw(int $max, ?OutputInterface $output = null): Generator {
3838
->setMaxResults(100);
3939

4040
do {
41-
$data = $selectQuery->execute();
41+
$data = $selectQuery->executeQuery();
4242
$rows = $data->fetchAll();
4343
foreach ($rows as $row) {
4444
yield $row;
@@ -95,27 +95,27 @@ public function extractAndTransform(int $max = self::MAX_BATCH_SIZE, ?OutputInte
9595
$select
9696
->setParameter('uid', $row['uid'])
9797
->setParameter('ip', $row['ip']);
98-
$result = $select->execute();
98+
$result = $select->executeQuery();
9999
$existing = $result->fetch();
100100
$result->closeCursor();
101101
if (empty($existing)) {
102102
$insert->setParameter('uid', $row['uid']);
103103
$insert->setParameter('ip', $row['ip']);
104104
$insert->setParameter('seen', 1, IQueryBuilder::PARAM_INT);
105105
$insert->setParameter('ts', $row['created_at'], IQueryBuilder::PARAM_INT);
106-
$insert->execute();
106+
$insert->executeStatement();
107107
} else {
108108
$update
109109
->setParameter('uid', $row['uid'])
110110
->setParameter('ip', $row['ip'])
111111
->setParameter('seen', $existing['seen'] + 1)
112112
->setParameter('first_seen', min($existing['first_seen'], $row['created_at']))
113113
->setParameter('last_seen', max($existing['last_seen'], $row['created_at']));
114-
$update->execute();
114+
$update->executeStatement();
115115

116116
$cleanUp
117117
->setParameter('id', $row['id']);
118-
$cleanUp->execute();
118+
$cleanUp->executeStatement();
119119
}
120120
}
121121
$this->logger->debug('finished login data ETL process, sending transaction commit');

0 commit comments

Comments
 (0)