Refactor OC\DB\QueryBuilder::execute

Signed-off-by: Andrew Summers <18727110+summersab@users.noreply.github.com>

Fix CI errors

core/Command/Db/ConvertType.php

@@ -298,7 +298,7 @@ protected function copyTable(Connection $fromDB, Connection $toDB, Table $table,
 		$query->automaticTablePrefix(false);
 		$query->select($query->func()->count('*', 'num_entries'))
 			->from($table->getName());
-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$count = $result->fetchOne();
 		$result->closeCursor();
 
@@ -337,7 +337,7 @@ protected function copyTable(Connection $fromDB, Connection $toDB, Table $table,
 		for ($chunk = 0; $chunk < $numChunks; $chunk++) {
 			$query->setFirstResult($chunk * $chunkSize);
 
-			$result = $query->execute();
+			$result = $query->executeQuery();
 
 			try {
 				$toDB->beginTransaction();
@@ -359,7 +359,7 @@ protected function copyTable(Connection $fromDB, Connection $toDB, Table $table,
 							$insertQuery->setParameter($key, $value);
 						}
 					}
-					$insertQuery->execute();
+					$insertQuery->executeStatement();
 				}
 				$result->closeCursor();
 

core/Command/Preview/ResetRenderedTexts.php

@@ -137,7 +137,7 @@ private function getPreviewsToDelete(): \Iterator {
 		$qb->select('path', 'mimetype')
 			->from('filecache')
 			->where($qb->expr()->eq('fileid', $qb->createNamedParameter($this->previewFolder->getId())));
-		$cursor = $qb->execute();
+		$cursor = $qb->executeQuery();
 		$data = $cursor->fetch();
 		$cursor->closeCursor();
 
@@ -170,7 +170,7 @@ private function getPreviewsToDelete(): \Iterator {
 				)
 			);
 
-		$cursor = $qb->execute();
+		$cursor = $qb->executeQuery();
 
 		while ($row = $cursor->fetch()) {
 			yield $row;

core/Db/LoginFlowV2Mapper.php

@@ -88,7 +88,7 @@ public function cleanup(): void {
 				$qb->expr()->lt('timestamp', $qb->createNamedParameter($this->timeFactory->getTime() - self::lifetime))
 			);
 
-		$qb->execute();
+		$qb->executeStatement();
 	}
 
 	/**

lib/private/Accounts/AccountManager.php

@@ -273,7 +273,7 @@ public function deleteUser(IUser $user): void {
 		$query = $this->connection->getQueryBuilder();
 		$query->delete($this->table)
 			->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
-			->execute();
+			->executeStatement();
 
 		$this->deleteUserData($user);
 	}
@@ -286,7 +286,7 @@ public function deleteUserData(IUser $user): void {
 		$query = $this->connection->getQueryBuilder();
 		$query->delete($this->dataTable)
 			->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
-			->execute();
+			->executeStatement();
 	}
 
 	/**

lib/private/AppConfig.php

@@ -306,7 +306,7 @@ public function setValue($app, $key, $value) {
 			}
 		}
 
-		$changedRow = (bool) $sql->execute();
+		$changedRow = (bool) $sql->executeStatement();
 
 		$this->cache[$app][$key] = $value;
 
@@ -329,7 +329,7 @@ public function deleteKey($app, $key) {
 			->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
 			->setParameter('app', $app)
 			->setParameter('configkey', $key);
-		$sql->execute();
+		$sql->executeStatement();
 
 		unset($this->cache[$app][$key]);
 		return false;
@@ -350,7 +350,7 @@ public function deleteApp($app) {
 		$sql->delete('appconfig')
 			->where($sql->expr()->eq('appid', $sql->createParameter('app')))
 			->setParameter('app', $app);
-		$sql->execute();
+		$sql->executeStatement();
 
 		unset($this->cache[$app]);
 		return false;
@@ -415,7 +415,7 @@ protected function loadConfigValues() {
 		$sql = $this->conn->getQueryBuilder();
 		$sql->select('*')
 			->from('appconfig');
-		$result = $sql->execute();
+		$result = $sql->executeQuery();
 
 		// we are going to store the result in memory anyway
 		$rows = $result->fetchAll();

lib/private/Authentication/Token/PublicKeyTokenMapper.php

@@ -51,7 +51,7 @@ public function invalidate(string $token) {
 		$qb->delete($this->tableName)
 			->where($qb->expr()->eq('token', $qb->createNamedParameter($token)))
 			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
-			->execute();
+			->executeStatement();
 	}
 
 	/**
@@ -66,7 +66,7 @@ public function invalidateOld(int $olderThan, int $remember = IToken::DO_NOT_REM
 			->andWhere($qb->expr()->eq('type', $qb->createNamedParameter(IToken::TEMPORARY_TOKEN, IQueryBuilder::PARAM_INT)))
 			->andWhere($qb->expr()->eq('remember', $qb->createNamedParameter($remember, IQueryBuilder::PARAM_INT)))
 			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
-			->execute();
+			->executeStatement();
 	}
 
 	public function invalidateLastUsedBefore(string $uid, int $before): int {
@@ -90,7 +90,7 @@ public function getToken(string $token): PublicKeyToken {
 			->from($this->tableName)
 			->where($qb->expr()->eq('token', $qb->createNamedParameter($token)))
 			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
-			->execute();
+			->executeQuery();
 
 		$data = $result->fetch();
 		$result->closeCursor();
@@ -112,7 +112,7 @@ public function getTokenById(int $id): PublicKeyToken {
 			->from($this->tableName)
 			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
 			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
-			->execute();
+			->executeQuery();
 
 		$data = $result->fetch();
 		$result->closeCursor();
@@ -139,7 +139,7 @@ public function getTokenByUser(string $uid): array {
 			->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
 			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
 			->setMaxResults(1000);
-		$result = $qb->execute();
+		$result = $qb->executeQuery();
 		$data = $result->fetchAll();
 		$result->closeCursor();
 
@@ -157,7 +157,7 @@ public function deleteById(string $uid, int $id) {
 			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
 			->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
 			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
-		$qb->execute();
+		$qb->executeStatement();
 	}
 
 	/**
@@ -170,7 +170,7 @@ public function deleteByName(string $name) {
 		$qb->delete($this->tableName)
 			->where($qb->expr()->eq('name', $qb->createNamedParameter($name), IQueryBuilder::PARAM_STR))
 			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
-		$qb->execute();
+		$qb->executeStatement();
 	}
 
 	public function deleteTempToken(PublicKeyToken $except) {
@@ -182,7 +182,7 @@ public function deleteTempToken(PublicKeyToken $except) {
 			->andWhere($qb->expr()->neq('id', $qb->createNamedParameter($except->getId())))
 			->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
 
-		$qb->execute();
+		$qb->executeStatement();
 	}
 
 	public function hasExpiredTokens(string $uid): bool {
@@ -193,7 +193,7 @@ public function hasExpiredTokens(string $uid): bool {
 			->andWhere($qb->expr()->eq('password_invalid', $qb->createNamedParameter(true), IQueryBuilder::PARAM_BOOL))
 			->setMaxResults(1);
 
-		$cursor = $qb->execute();
+		$cursor = $qb->executeQuery();
 		$data = $cursor->fetchAll();
 		$cursor->closeCursor();
 

lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php

@@ -56,7 +56,7 @@ public function getState(string $uid): array {
 		$query = $qb->select('provider_id', 'enabled')
 			->from(self::TABLE_NAME)
 			->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$providers = [];
 		foreach ($result->fetchAll() as $row) {
 			$providers[(string)$row['provider_id']] = 1 === (int)$row['enabled'];
@@ -80,14 +80,14 @@ public function persist(string $providerId, string $uid, int $enabled): void {
 				'enabled' => $qb->createNamedParameter($enabled, IQueryBuilder::PARAM_INT),
 			]);
 
-			$insertQuery->execute();
+			$insertQuery->executeStatement();
 		} catch (UniqueConstraintViolationException $ex) {
 			// There is already an entry -> update it
 			$updateQuery = $qb->update(self::TABLE_NAME)
 				->set('enabled', $qb->createNamedParameter($enabled))
 				->where($qb->expr()->eq('provider_id', $qb->createNamedParameter($providerId)))
 				->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
-			$updateQuery->execute();
+			$updateQuery->executeStatement();
 		}
 	}
 
@@ -103,15 +103,15 @@ public function deleteByUser(string $uid): array {
 		$selectQuery = $qb1->select('*')
 			->from(self::TABLE_NAME)
 			->where($qb1->expr()->eq('uid', $qb1->createNamedParameter($uid)));
-		$selectResult = $selectQuery->execute();
+		$selectResult = $selectQuery->executeQuery();
 		$rows = $selectResult->fetchAll();
 		$selectResult->closeCursor();
 
 		$qb2 = $this->conn->getQueryBuilder();
 		$deleteQuery = $qb2
 			->delete(self::TABLE_NAME)
 			->where($qb2->expr()->eq('uid', $qb2->createNamedParameter($uid)));
-		$deleteQuery->execute();
+		$deleteQuery->executeStatement();
 
 		return array_map(function (array $row) {
 			return [
@@ -128,6 +128,6 @@ public function deleteAll(string $providerId): void {
 		$deleteQuery = $qb->delete(self::TABLE_NAME)
 			->where($qb->expr()->eq('provider_id', $qb->createNamedParameter($providerId)));
 
-		$deleteQuery->execute();
+		$deleteQuery->executeStatement();
 	}
 }

lib/private/BackgroundJob/JobList.php

@@ -119,11 +119,11 @@ public function remove($job, $argument = null): void {
 			$query->setMaxResults($max);
 
 			do {
-				$deleted = $query->execute();
+				$deleted = $query->executeStatement();
 			} while ($deleted === $max);
 		} else {
 			// Dont use chunked delete - let the DB handle the large row count natively
-			$query->execute();
+			$query->executeStatement();
 		}
 	}
 

lib/private/Collaboration/Resources/Collection.php

@@ -100,7 +100,7 @@ public function setName(string $name): void {
 		$query->update(Manager::TABLE_COLLECTIONS)
 			->set('name', $query->createNamedParameter($name))
 			->where($query->expr()->eq('id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
-		$query->execute();
+		$query->executeStatement();
 
 		$this->name = $name;
 	}
@@ -142,7 +142,7 @@ public function addResource(IResource $resource): void {
 			]);
 
 		try {
-			$query->execute();
+			$query->executeStatement();
 		} catch (ConstraintViolationException $e) {
 			throw new ResourceException('Already part of the collection');
 		}
@@ -166,7 +166,7 @@ public function removeResource(IResource $resource): void {
 			->where($query->expr()->eq('collection_id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)))
 			->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType())))
 			->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())));
-		$query->execute();
+		$query->executeStatement();
 
 		if (empty($this->resources)) {
 			$this->removeCollection();
@@ -222,7 +222,7 @@ protected function removeCollection(): void {
 		$query = $this->connection->getQueryBuilder();
 		$query->delete(Manager::TABLE_COLLECTIONS)
 			->where($query->expr()->eq('id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)));
-		$query->execute();
+		$query->executeStatement();
 
 		$this->manager->invalidateAccessCacheForCollection($this);
 		$this->id = 0;