Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions lib/Db/Mapper/SignatoryMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function getSignatories(): array {
->from(self::TABLENAME);

$entities = [];
$result = $query->execute();
$result = $query->executeQuery();
while ($row = $result->fetch()){
$entities[] = $this->mapRowToEntity($row);
}
Expand All @@ -56,7 +56,7 @@ public function getSignatoriesByUser(IUser $user): array {
->where($query->expr()->eq('user_id', $query->createNamedParameter($user->getUID())));

$entities = [];
$result = $query->execute();
$result = $query->executeQuery();
while ($row = $result->fetch()){
$entities[] = $this->mapRowToEntity($row);
}
Expand Down Expand Up @@ -97,7 +97,7 @@ public function updateUserId(string $oldId, string $newId): void {
->set('user_id', $query->createNamedParameter($newId))
->where($query->expr()->eq('user_id', $query->createNamedParameter($oldId)));

$query->execute();
$query->executeStatement();
}

/**
Expand All @@ -108,7 +108,7 @@ public function deleteTerm(Terms $terms) {
$query = $this->db->getQueryBuilder();
$query->delete(self::TABLENAME)
->where($query->expr()->eq('terms_id', $query->createNamedParameter($terms->getId())));
$query->execute();
$query->executeStatement();
}

/**
Expand All @@ -117,7 +117,7 @@ public function deleteTerm(Terms $terms) {
public function deleteAllSignatories() {
$query = $this->db->getQueryBuilder();
$query->delete(self::TABLENAME);
$query->execute();
$query->executeStatement();
}

/**
Expand All @@ -128,6 +128,6 @@ public function deleteSignatoriesByUser(IUser $user) {
$query = $this->db->getQueryBuilder();
$query->delete(self::TABLENAME)
->where($query->expr()->eq('user_id', $query->createNamedParameter($user->getUID())));
$query->execute();
$query->executeStatement();
}
}
6 changes: 3 additions & 3 deletions lib/Db/Mapper/TermsMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function getTermsForCountryCode(string $countryCode): array {
$countryCode => [],
];

$result = $query->execute();
$result = $query->executeQuery();
while ($row = $result->fetch()){
$entities[$row['country_code']][] = $this->mapRowToEntity($row);
}
Expand Down Expand Up @@ -68,7 +68,7 @@ public function getTermsForCountryCodeAndLanguageCode(string $countryCode, strin
->from(self::TABLENAME)
->where($query->expr()->eq('country_code', $query->createNamedParameter($countryCode)))
->andWhere($query->expr()->eq('language_code', $query->createNamedParameter($languageCode)));
$result = $query->execute();
$result = $query->executeQuery();
$row = $result->fetch();
$result->closeCursor();

Expand All @@ -89,7 +89,7 @@ public function getTerms(): array {
->from(self::TABLENAME);

$entities = [];
$result = $query->execute();
$result = $query->executeQuery();
while ($row = $result->fetch()){
$entities[$row['id']] = $this->mapRowToEntity($row);
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Migration/Version1000Date20181122140802.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array
$query->select('*')
->from('termsofservice_signatories');

$result = $query->execute();
$result = $query->executeQuery();
while ($row = $result->fetch()) {
$insert
->setParameter('terms_id', (int) $row['terms_id'], IQueryBuilder::PARAM_INT)
->setParameter('user_id', $row['user_id'])
->setParameter('timestamp', (int) $row['timestamp'], IQueryBuilder::PARAM_INT);
$insert->execute();
$insert->executeStatement();
}
$result->closeCursor();
}
Expand Down
Loading