refactor(querybuilder): Port away from qb::execute() in tests/

Replace by either executeStatement or executeQuery Signed-off-by: Carl Schwan <carl.schwan@nextclound.com>
1 month ago · 9b2fff5931
20 changed files with 202 additions and 208 deletions
--- a/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php
+++ b/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php
@ -43,7 +43,7 @@ class PublicKeyTokenMapperTest extends TestCase {

 	private function resetDatabase() {
 		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->delete('authtoken')->execute();
+		$qb->delete('authtoken')->executeStatement();
 		$qb->insert('authtoken')->values([
 			'uid' => $qb->createNamedParameter('user1'),
 			'login_name' => $qb->createNamedParameter('User1'),
@ -56,7 +56,7 @@ class PublicKeyTokenMapperTest extends TestCase {
 			'public_key' => $qb->createNamedParameter('public key'),
 			'private_key' => $qb->createNamedParameter('private key'),
 			'version' => $qb->createNamedParameter(2),
-		])->execute();
+		])->executeStatement();
 		$qb->insert('authtoken')->values([
 			'uid' => $qb->createNamedParameter('user2'),
 			'login_name' => $qb->createNamedParameter('User2'),
@ -69,7 +69,7 @@ class PublicKeyTokenMapperTest extends TestCase {
 			'public_key' => $qb->createNamedParameter('public key'),
 			'private_key' => $qb->createNamedParameter('private key'),
 			'version' => $qb->createNamedParameter(2),
-		])->execute();
+		])->executeStatement();
 		$qb->insert('authtoken')->values([
 			'uid' => $qb->createNamedParameter('user1'),
 			'login_name' => $qb->createNamedParameter('User1'),
@ -82,7 +82,7 @@ class PublicKeyTokenMapperTest extends TestCase {
 			'public_key' => $qb->createNamedParameter('public key'),
 			'private_key' => $qb->createNamedParameter('private key'),
 			'version' => $qb->createNamedParameter(2),
-		])->execute();
+		])->executeStatement();
 		$qb->insert('authtoken')->values([
 			'uid' => $qb->createNamedParameter('user3'),
 			'login_name' => $qb->createNamedParameter('User3'),
@ -96,7 +96,7 @@ class PublicKeyTokenMapperTest extends TestCase {
 			'private_key' => $qb->createNamedParameter('private key'),
 			'version' => $qb->createNamedParameter(2),
 			'password_invalid' => $qb->createNamedParameter(1),
-		])->execute();
+		])->executeStatement();
 		$qb->insert('authtoken')->values([
 			'uid' => $qb->createNamedParameter('user3'),
 			'login_name' => $qb->createNamedParameter('User3'),
@ -110,14 +110,14 @@ class PublicKeyTokenMapperTest extends TestCase {
 			'private_key' => $qb->createNamedParameter('private key'),
 			'version' => $qb->createNamedParameter(2),
 			'password_invalid' => $qb->createNamedParameter(1),
-		])->execute();
+		])->executeStatement();
 	}

 	private function getNumberOfTokens() {
 		$qb = $this->dbConnection->getQueryBuilder();
 		$result = $qb->select($qb->func()->count('*', 'count'))
 			->from('authtoken')
-			->execute()
+			->executeQuery()
 			->fetch();
 		return (int)$result['count'];
 	}
@ -240,7 +240,7 @@ class PublicKeyTokenMapperTest extends TestCase {
 		$qb->select('id')
 			->from('authtoken')
 			->where($qb->expr()->eq('token', $qb->createNamedParameter('9c5a2e661482b65597408a6bb6c4a3d1af36337381872ac56e445a06cdb7fea2b1039db707545c11027a4966919918b19d875a8b774840b18c6cbb7ae56fe206')));
-		$result = $qb->execute();
+		$result = $qb->executeQuery();
 		$id = $result->fetch()['id'];

 		$token = $this->mapper->getTokenById((int)$id);
@ -252,7 +252,7 @@ class PublicKeyTokenMapperTest extends TestCase {
 		$qb->select('name')
 			->from('authtoken')
 			->where($qb->expr()->eq('token', $qb->createNamedParameter('9c5a2e661482b65597408a6bb6c4a3d1af36337381872ac56e445a06cdb7fea2b1039db707545c11027a4966919918b19d875a8b774840b18c6cbb7ae56fe206')));
-		$result = $qb->execute();
+		$result = $qb->executeQuery();
 		$name = $result->fetch()['name'];
 		$this->mapper->deleteByName($name);
 		$this->assertEquals(4, $this->getNumberOfTokens());
--- a/tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php
+++ b/tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php
@ -30,7 +30,7 @@ class ProviderUserAssignmentDaoTest extends TestCase {
 		$this->dbConn = Server::get(IDBConnection::class);
 		$qb = $this->dbConn->getQueryBuilder();
 		$q = $qb->delete(ProviderUserAssignmentDao::TABLE_NAME);
-		$q->execute();
+		$q->executeStatement();

 		$this->dao = new ProviderUserAssignmentDao($this->dbConn);
 	}
@ -42,13 +42,13 @@ class ProviderUserAssignmentDaoTest extends TestCase {
 			'uid' => $qb->createNamedParameter('user123'),
 			'enabled' => $qb->createNamedParameter(1),
 		]);
-		$q1->execute();
+		$q1->executeStatement();
 		$q2 = $qb->insert(ProviderUserAssignmentDao::TABLE_NAME)->values([
 			'provider_id' => $qb->createNamedParameter('twofactor_totp'),
 			'uid' => $qb->createNamedParameter('user123'),
 			'enabled' => $qb->createNamedParameter(0),
 		]);
-		$q2->execute();
+		$q2->executeStatement();
 		$expected = [
 			'twofactor_u2f' => true,
 			'twofactor_totp' => false,
@ -70,7 +70,7 @@ class ProviderUserAssignmentDaoTest extends TestCase {
 			->where($qb->expr()->eq('provider_id', $qb->createNamedParameter('twofactor_totp')))
 			->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter('user123')))
 			->andWhere($qb->expr()->eq('enabled', $qb->createNamedParameter(0)));
-		$res = $q->execute();
+		$res = $q->executeQuery();
 		$data = $res->fetchAll();
 		$res->closeCursor();
 		$this->assertCount(1, $data);
@ -88,7 +88,7 @@ class ProviderUserAssignmentDaoTest extends TestCase {
 			->where($qb->expr()->eq('provider_id', $qb->createNamedParameter('twofactor_totp')))
 			->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter('user123')))
 			->andWhere($qb->expr()->eq('enabled', $qb->createNamedParameter(1)));
-		$res = $q->execute();
+		$res = $q->executeQuery();
 		$data = $res->fetchAll();
 		$res->closeCursor();

@ -107,7 +107,7 @@ class ProviderUserAssignmentDaoTest extends TestCase {
 			->where($qb->expr()->eq('provider_id', $qb->createNamedParameter('twofactor_totp')))
 			->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter('user123')))
 			->andWhere($qb->expr()->eq('enabled', $qb->createNamedParameter(1)));
-		$res = $q->execute();
+		$res = $q->executeQuery();
 		$data = $res->fetchAll();
 		$res->closeCursor();

--- a/tests/lib/BackgroundJob/JobListTest.php
+++ b/tests/lib/BackgroundJob/JobListTest.php
@ -58,7 +58,7 @@ class JobListTest extends TestCase {
 	protected function clearJobsList() {
 		$query = $this->connection->getQueryBuilder();
 		$query->delete('jobs');
-		$query->execute();
+		$query->executeStatement();
 	}

 	protected function getAllSorted() {
--- a/tests/lib/Calendar/ResourcesRoomsUpdaterTest.php
+++ b/tests/lib/Calendar/ResourcesRoomsUpdaterTest.php
@ -62,10 +62,10 @@ class ResourcesRoomsUpdaterTest extends TestCase {

 	protected function tearDown(): void {
 		$query = self::$realDatabase->getQueryBuilder();
-		$query->delete('calendar_resources')->execute();
-		$query->delete('calendar_resources_md')->execute();
-		$query->delete('calendar_rooms')->execute();
-		$query->delete('calendar_rooms_md')->execute();
+		$query->delete('calendar_resources')->executeStatement();
+		$query->delete('calendar_resources_md')->executeStatement();
+		$query->delete('calendar_rooms')->executeStatement();
+		$query->delete('calendar_rooms_md')->executeStatement();
 	}

 	/**
@ -215,7 +215,7 @@ class ResourcesRoomsUpdaterTest extends TestCase {

 		$rows = [];
 		$ids = [];
-		$stmt = $query->execute();
+		$stmt = $query->executeQuery();
 		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
 			$ids[$row['backend_id'] . '::' . $row['resource_id']] = $row['id'];
 			unset($row['id']);
@ -285,7 +285,7 @@ class ResourcesRoomsUpdaterTest extends TestCase {
 		$query2->select('*')->from('calendar_resources_md');

 		$rows2 = [];
-		$stmt = $query2->execute();
+		$stmt = $query2->executeQuery();
 		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
 			unset($row['id']);
 			$rows2[] = $row;
@ -345,7 +345,7 @@ class ResourcesRoomsUpdaterTest extends TestCase {
 				'displayname' => $query->createNamedParameter('Beamer1'),
 				'group_restrictions' => $query->createNamedParameter('[]'),
 			])
-			->execute();
+			->executeStatement();

 		$query->insert('calendar_resources')
 			->values([
@ -355,7 +355,7 @@ class ResourcesRoomsUpdaterTest extends TestCase {
 				'displayname' => $query->createNamedParameter('TV1'),
 				'group_restrictions' => $query->createNamedParameter('[]'),
 			])
-			->execute();
+			->executeStatement();

 		$query->insert('calendar_resources')
 			->values([
@ -365,7 +365,7 @@ class ResourcesRoomsUpdaterTest extends TestCase {
 				'displayname' => $query->createNamedParameter('Beamer2'),
 				'group_restrictions' => $query->createNamedParameter('[]'),
 			])
-			->execute();
+			->executeStatement();
 		$id3 = $query->getLastInsertId();

 		$query->insert('calendar_resources')
@ -376,7 +376,7 @@ class ResourcesRoomsUpdaterTest extends TestCase {
 				'displayname' => $query->createNamedParameter('TV2'),
 				'group_restrictions' => $query->createNamedParameter('[]'),
 			])
-			->execute();
+			->executeStatement();
 		$id4 = $query->getLastInsertId();

 		$query->insert('calendar_resources')
@ -387,7 +387,7 @@ class ResourcesRoomsUpdaterTest extends TestCase {
 				'displayname' => $query->createNamedParameter('Beamer3'),
 				'group_restrictions' => $query->createNamedParameter('[]'),
 			])
-			->execute();
+			->executeStatement();

 		$query->insert('calendar_resources')
 			->values([
@ -397,7 +397,7 @@ class ResourcesRoomsUpdaterTest extends TestCase {
 				'displayname' => $query->createNamedParameter('Pointer'),
 				'group_restrictions' => $query->createNamedParameter('["foo", "bar"]'),
 			])
-			->execute();
+			->executeStatement();
 		$id6 = $query->getLastInsertId();

 		$query->insert('calendar_resources_md')
@ -406,34 +406,34 @@ class ResourcesRoomsUpdaterTest extends TestCase {
 				'key' => $query->createNamedParameter('meta1'),
 				'value' => $query->createNamedParameter('value1')
 			])
-			->execute();
+			->executeStatement();
 		$query->insert('calendar_resources_md')
 			->values([
 				'resource_id' => $query->createNamedParameter($id3),
 				'key' => $query->createNamedParameter('meta2'),
 				'value' => $query->createNamedParameter('value2')
 			])
-			->execute();
+			->executeStatement();
 		$query->insert('calendar_resources_md')
 			->values([
 				'resource_id' => $query->createNamedParameter($id4),
 				'key' => $query->createNamedParameter('meta1'),
 				'value' => $query->createNamedParameter('value1')
 			])
-			->execute();
+			->executeStatement();
 		$query->insert('calendar_resources_md')
 			->values([
 				'resource_id' => $query->createNamedParameter($id4),
 				'key' => $query->createNamedParameter('meta3'),
 				'value' => $query->createNamedParameter('value3-old')
 			])
-			->execute();
+			->executeStatement();
 		$query->insert('calendar_resources_md')
 			->values([
 				'resource_id' => $query->createNamedParameter($id6),
 				'key' => $query->createNamedParameter('meta99'),
 				'value' => $query->createNamedParameter('value99')
 			])
-			->execute();
+			->executeStatement();
 	}
 }
--- a/tests/lib/DB/AdapterTest.php
+++ b/tests/lib/DB/AdapterTest.php
@ -26,7 +26,7 @@ class AdapterTest extends TestCase {
 		$qb->delete('appconfig')
 			->from('appconfig')
 			->where($qb->expr()->eq('appid', $qb->createNamedParameter($this->appId)))
-			->execute();
+			->executeStatement();
 	}

 	public function testInsertIgnoreOnConflictDuplicate(): void {
@ -63,7 +63,7 @@ class AdapterTest extends TestCase {
 			->from('appconfig')
 			->where($qb->expr()->eq('appid', $qb->createNamedParameter($this->appId)))
 			->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($configKey)))
-			->execute()
+			->executeQuery()
 			->fetchAll();
 	}
 }
--- a/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php
+++ b/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php
@ -61,7 +61,7 @@ class ExpressionBuilderDBTest extends TestCase {
 			->from('users')
 			->where($query->expr()->like($query->createNamedParameter($param1), $query->createNamedParameter($param2)));

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$column = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertEquals($match, $column);
@ -98,7 +98,7 @@ class ExpressionBuilderDBTest extends TestCase {
 			->from('users')
 			->where($query->expr()->iLike($query->createNamedParameter($param1), $query->createNamedParameter($param2)));

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$column = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertEquals($match, $column);
@ -204,7 +204,7 @@ class ExpressionBuilderDBTest extends TestCase {
 				'configkey' => $query->createNamedParameter((string)$key),
 				'configvalue' => $query->createNamedParameter((string)$value),
 			])
-			->execute();
+			->executeStatement();
 	}

 	protected function prepareTestingTable(): void {
--- a/tests/lib/DB/QueryBuilder/ExpressionBuilderTest.php
+++ b/tests/lib/DB/QueryBuilder/ExpressionBuilderTest.php
@ -407,7 +407,7 @@ class ExpressionBuilderTest extends TestCase {
 			$query->andWhere(call_user_func([$query->expr(), $function], 'configkey', 'configvalue', IQueryBuilder::PARAM_STR));
 		}

-		$result = $query->execute();
+		$result = $query->executeQuery();

 		$this->assertEquals(['count' => $expected], $result->fetch());
 		$result->closeCursor();
@ -415,7 +415,7 @@ class ExpressionBuilderTest extends TestCase {
 		$query = $this->connection->getQueryBuilder();
 		$query->delete('appconfig')
 			->where($query->expr()->eq('appid', $query->createNamedParameter($appId)))
-			->execute();
+			->executeStatement();
 	}

 	protected function createConfig($appId, $key, $value) {
@ -426,6 +426,6 @@ class ExpressionBuilderTest extends TestCase {
 				'configkey' => $query->createNamedParameter((string)$key),
 				'configvalue' => $query->createNamedParameter((string)$value),
 			])
-			->execute();
+			->executeStatement();
 	}
 }
--- a/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php
+++ b/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php
@ -44,7 +44,7 @@ class FunctionBuilderTest extends TestCase {
 		$query->from('appconfig')
 			->setMaxResults(1);

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$column = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertEquals($return, $column);
@ -120,7 +120,7 @@ class FunctionBuilderTest extends TestCase {
 			->from('appconfig')
 			->where($query->expr()->eq('appid', $query->createNamedParameter('group_concat')));

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$column = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertStringContainsString(',', $column);
@ -136,7 +136,7 @@ class FunctionBuilderTest extends TestCase {
 			->from('appconfig')
 			->where($query->expr()->eq('appid', $query->createNamedParameter('group_concat')));

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$column = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertStringContainsString('#', $column);
@ -152,7 +152,7 @@ class FunctionBuilderTest extends TestCase {
 			->from('appconfig')
 			->where($query->expr()->eq('appid', $query->createNamedParameter('group_concat')));

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$column = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertStringContainsString("'", $column);
@ -168,7 +168,7 @@ class FunctionBuilderTest extends TestCase {
 			->from('appconfig')
 			->where($query->expr()->eq('appid', $query->createNamedParameter('group_concat')));

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$column = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertStringContainsString('"', $column);
@ -209,7 +209,7 @@ class FunctionBuilderTest extends TestCase {
 			->from('systemtag')
 			->where($query->expr()->eq('name', $query->createNamedParameter('group_concat')));

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$column = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertStringContainsString(',', $column);
@ -225,7 +225,7 @@ class FunctionBuilderTest extends TestCase {
 			->from('systemtag')
 			->where($query->expr()->eq('name', $query->createNamedParameter('group_concat')));

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$column = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertStringContainsString('#', $column);
@ -240,7 +240,7 @@ class FunctionBuilderTest extends TestCase {
 		$query->from('appconfig')
 			->setMaxResults(1);

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$column = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertEquals(md5('foobar'), $column);
@ -253,7 +253,7 @@ class FunctionBuilderTest extends TestCase {
 		$query->from('appconfig')
 			->setMaxResults(1);

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$column = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertEquals('oo', $column);
@ -266,7 +266,7 @@ class FunctionBuilderTest extends TestCase {
 		$query->from('appconfig')
 			->setMaxResults(1);

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$column = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertEquals('oobar', $column);
@ -279,7 +279,7 @@ class FunctionBuilderTest extends TestCase {
 		$query->from('appconfig')
 			->setMaxResults(1);

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$column = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertEquals('foobar', $column);
@ -292,7 +292,7 @@ class FunctionBuilderTest extends TestCase {
 		$query->from('appconfig')
 			->setMaxResults(1);

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$column = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertEquals(3, $column);
@ -305,7 +305,7 @@ class FunctionBuilderTest extends TestCase {
 		$query->from('appconfig')
 			->setMaxResults(1);

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$column = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertEquals(1, $column);
@ -318,7 +318,7 @@ class FunctionBuilderTest extends TestCase {
 		$query->from('appconfig')
 			->setMaxResults(1);

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$column = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertGreaterThan(1, $column);
@ -341,7 +341,7 @@ class FunctionBuilderTest extends TestCase {
 		$query->from('appconfig')
 			->setMaxResults(1);

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$column = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertEquals($bytes, $column);
@ -364,7 +364,7 @@ class FunctionBuilderTest extends TestCase {
 		$query->from('appconfig')
 			->setMaxResults(1);

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$column = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertNotNull($column);
@ -380,7 +380,7 @@ class FunctionBuilderTest extends TestCase {
 				'configkey' => $query->createNamedParameter(uniqid()),
 				'configvalue' => $query->createNamedParameter((string)$value),
 			]);
-		$query->execute();
+		$query->executeStatement();
 	}

 	private function clearMinMax() {
@ -388,7 +388,7 @@ class FunctionBuilderTest extends TestCase {

 		$query->delete('appconfig')
 			->where($query->expr()->eq('appid', $query->createNamedParameter('minmax')));
-		$query->execute();
+		$query->executeStatement();
 	}

 	public function testMaxEmpty(): void {
@ -401,7 +401,7 @@ class FunctionBuilderTest extends TestCase {
 			->where($query->expr()->eq('appid', $query->createNamedParameter('minmax')))
 			->setMaxResults(1);

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$row = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertEquals(null, $row);
@ -417,7 +417,7 @@ class FunctionBuilderTest extends TestCase {
 			->where($query->expr()->eq('appid', $query->createNamedParameter('minmax')))
 			->setMaxResults(1);

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$row = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertEquals(null, $row);
@ -436,7 +436,7 @@ class FunctionBuilderTest extends TestCase {
 			->where($query->expr()->eq('appid', $query->createNamedParameter('minmax')))
 			->setMaxResults(1);

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$row = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertEquals(20, $row);
@ -455,7 +455,7 @@ class FunctionBuilderTest extends TestCase {
 			->where($query->expr()->eq('appid', $query->createNamedParameter('minmax')))
 			->setMaxResults(1);

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$row = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertEquals(10, $row);
@ -468,7 +468,7 @@ class FunctionBuilderTest extends TestCase {
 		$query->from('appconfig')
 			->setMaxResults(1);

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$row = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertEquals(2, $row);
@ -481,7 +481,7 @@ class FunctionBuilderTest extends TestCase {
 		$query->from('appconfig')
 			->setMaxResults(1);

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$row = $result->fetchOne();
 		$result->closeCursor();
 		$this->assertEquals(1, $row);
--- a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
+++ b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
@ -15,6 +15,7 @@ use OC\DB\QueryBuilder\Parameter;
 use OC\DB\QueryBuilder\QueryBuilder;
 use OC\SystemConfig;
 use OCP\DB\IResult;
+use OCP\DB\QueryBuilder\ILiteral;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\DB\QueryBuilder\IQueryFunction;
 use OCP\IDBConnection;
@ -59,7 +60,7 @@ class QueryBuilderTest extends \Test\TestCase {
 					'configkey' => $qB->expr()->literal('testing' . $i),
 					'configvalue' => $qB->expr()->literal(100 - $i),
 				])
-				->execute();
+				->executeStatement();
 		}
 	}

@ -72,7 +73,7 @@ class QueryBuilderTest extends \Test\TestCase {
 			))
 			->orderBy('configkey', 'ASC');

-		$query = $queryBuilder->execute();
+		$query = $queryBuilder->executeQuery();
 		$rows = [];
 		while ($row = $query->fetch()) {
 			$rows[] = $row['configvalue'];
@ -87,7 +88,7 @@ class QueryBuilderTest extends \Test\TestCase {

 		$qB->delete('*PREFIX*appconfig')
 			->where($qB->expr()->eq('appid', $qB->expr()->literal($appId)))
-			->execute();
+			->executeStatement();
 	}

 	public static function dataFirstResult(): array {
@ -212,7 +213,7 @@ class QueryBuilderTest extends \Test\TestCase {
 			->orderBy('configkey', 'ASC')
 			->setMaxResults(1);

-		$query = $this->queryBuilder->execute();
+		$query = $this->queryBuilder->executeQuery();
 		$row = $query->fetch();
 		$query->closeCursor();

@ -241,14 +242,8 @@ class QueryBuilderTest extends \Test\TestCase {
 		];
 	}

-	/**
-	 *
-	 * @param mixed $select
-	 * @param array $alias
-	 * @param array $expected
-	 */
 	#[\PHPUnit\Framework\Attributes\DataProvider('dataSelectAlias')]
-	public function testSelectAlias($select, $alias, $expected): void {
+	public function testSelectAlias(string|ILiteral $select, string $alias, array $expected): void {
 		$this->deleteTestingRows();
 		$this->createTestingRows();

@ -262,7 +257,7 @@ class QueryBuilderTest extends \Test\TestCase {
 			->orderBy('configkey', 'ASC')
 			->setMaxResults(1);

-		$query = $this->queryBuilder->execute();
+		$query = $this->queryBuilder->executeQuery();
 		$row = $query->fetch();
 		$query->closeCursor();

@ -289,7 +284,7 @@ class QueryBuilderTest extends \Test\TestCase {
 			))
 			->orderBy('appid', 'DESC');

-		$query = $this->queryBuilder->execute();
+		$query = $this->queryBuilder->executeQuery();
 		$rows = $query->fetchAll();
 		$query->closeCursor();

@ -317,7 +312,7 @@ class QueryBuilderTest extends \Test\TestCase {
 			))
 			->orderBy('configkey', 'ASC');

-		$query = $this->queryBuilder->execute();
+		$query = $this->queryBuilder->executeQuery();
 		$rows = $query->fetchAll();
 		$query->closeCursor();

@ -391,7 +386,7 @@ class QueryBuilderTest extends \Test\TestCase {
 			->orderBy('configkey', 'ASC')
 			->setMaxResults(1);

-		$query = $this->queryBuilder->execute();
+		$query = $this->queryBuilder->executeQuery();
 		$row = $query->fetch();
 		$query->closeCursor();

@ -1179,7 +1174,7 @@ class QueryBuilderTest extends \Test\TestCase {
 				'propertyname' => $qB->expr()->literal('testing'),
 				'propertyvalue' => $qB->expr()->literal('testing'),
 			])
-			->execute();
+			->executeStatement();

 		$actual = $qB->getLastInsertId();

@ -1189,7 +1184,7 @@ class QueryBuilderTest extends \Test\TestCase {

 		$qB->delete('properties')
 			->where($qB->expr()->eq('userid', $qB->expr()->literal('testFirstResult')))
-			->execute();
+			->executeStatement();

 		try {
 			$qB->getLastInsertId();
@ -1276,9 +1271,6 @@ class QueryBuilderTest extends \Test\TestCase {
 		$queryBuilder
 			->method('getParameterTypes')
 			->willReturn([]);
-		$queryBuilder
-			->method('getType')
-			->willReturn(\Doctrine\DBAL\Query\QueryBuilder::UPDATE);
 		$this->logger
 			->expects($this->never())
 			->method('debug');
@ -1290,7 +1282,7 @@ class QueryBuilderTest extends \Test\TestCase {

 		$this->invokePrivate($this->queryBuilder, 'queryBuilder', [$queryBuilder]);
 		$this->invokePrivate($this->queryBuilder, 'connection', [$this->getConnection()]);
-		$this->assertEquals(3, $this->queryBuilder->execute());
+		$this->assertEquals(3, $this->queryBuilder->executeStatement());
 	}

 	public function testExecuteWithLoggerAndNamedArray(): void {
@ -1308,9 +1300,6 @@ class QueryBuilderTest extends \Test\TestCase {
 				'foo' => IQueryBuilder::PARAM_STR,
 				'key' => IQueryBuilder::PARAM_STR,
 			]);
-		$queryBuilder
-			->method('getType')
-			->willReturn(\Doctrine\DBAL\Query\QueryBuilder::UPDATE);
 		$queryBuilder
 			->expects($this->any())
 			->method('getSQL')
@ -1334,7 +1323,7 @@ class QueryBuilderTest extends \Test\TestCase {

 		$this->invokePrivate($this->queryBuilder, 'queryBuilder', [$queryBuilder]);
 		$this->invokePrivate($this->queryBuilder, 'connection', [$this->getConnection()]);
-		$this->assertEquals(3, $this->queryBuilder->execute());
+		$this->assertEquals(3, $this->queryBuilder->executeStatement());
 	}

 	public function testExecuteWithLoggerAndUnnamedArray(): void {
@ -1346,9 +1335,6 @@ class QueryBuilderTest extends \Test\TestCase {
 		$queryBuilder
 			->method('getParameterTypes')
 			->willReturn([IQueryBuilder::PARAM_STR]);
-		$queryBuilder
-			->method('getType')
-			->willReturn(\Doctrine\DBAL\Query\QueryBuilder::UPDATE);
 		$queryBuilder
 			->expects($this->any())
 			->method('getSQL')
@ -1372,7 +1358,7 @@ class QueryBuilderTest extends \Test\TestCase {

 		$this->invokePrivate($this->queryBuilder, 'queryBuilder', [$queryBuilder]);
 		$this->invokePrivate($this->queryBuilder, 'connection', [$this->getConnection()]);
-		$this->assertEquals(3, $this->queryBuilder->execute());
+		$this->assertEquals(3, $this->queryBuilder->executeStatement());
 	}

 	public function testExecuteWithLoggerAndNoParams(): void {
@ -1384,9 +1370,6 @@ class QueryBuilderTest extends \Test\TestCase {
 		$queryBuilder
 			->method('getParameterTypes')
 			->willReturn([]);
-		$queryBuilder
-			->method('getType')
-			->willReturn(\Doctrine\DBAL\Query\QueryBuilder::UPDATE);
 		$queryBuilder
 			->expects($this->any())
 			->method('getSQL')
@ -1409,7 +1392,7 @@ class QueryBuilderTest extends \Test\TestCase {

 		$this->invokePrivate($this->queryBuilder, 'queryBuilder', [$queryBuilder]);
 		$this->invokePrivate($this->queryBuilder, 'connection', [$this->getConnection()]);
-		$this->assertEquals(3, $this->queryBuilder->execute());
+		$this->assertEquals(3, $this->queryBuilder->executeStatement());
 	}

 	public function testExecuteWithParameterTooLarge(): void {
@ -1422,6 +1405,10 @@ class QueryBuilderTest extends \Test\TestCase {
 		$queryBuilder
 			->method('getParameterTypes')
 			->willReturn([IQueryBuilder::PARAM_STR_ARRAY]);
+		$queryBuilder
+			->expects($this->any())
+			->method('getType')
+			->willReturn(\Doctrine\DBAL\Query\QueryBuilder::SELECT);
 		$queryBuilder
 			->expects($this->any())
 			->method('getSQL')
@ -1444,7 +1431,7 @@ class QueryBuilderTest extends \Test\TestCase {

 		$this->invokePrivate($this->queryBuilder, 'queryBuilder', [$queryBuilder]);
 		$this->invokePrivate($this->queryBuilder, 'connection', [$this->getConnection()]);
-		$this->queryBuilder->execute();
+		$this->queryBuilder->executeQuery();
 	}

 	public function testExecuteWithParametersTooMany(): void {
@ -1457,6 +1444,10 @@ class QueryBuilderTest extends \Test\TestCase {
 		$queryBuilder
 			->method('getParameterTypes')
 			->willReturn([IQueryBuilder::PARAM_STR_ARRAY]);
+		$queryBuilder
+			->expects($this->any())
+			->method('getType')
+			->willReturn(\Doctrine\DBAL\Query\QueryBuilder::SELECT);
 		$queryBuilder
 			->expects($this->any())
 			->method('getSQL')
@ -1479,6 +1470,6 @@ class QueryBuilderTest extends \Test\TestCase {

 		$this->invokePrivate($this->queryBuilder, 'queryBuilder', [$queryBuilder]);
 		$this->invokePrivate($this->queryBuilder, 'connection', [$this->getConnection()]);
-		$this->queryBuilder->execute();
+		$this->queryBuilder->executeQuery();
 	}
 }
--- a/tests/lib/Files/Cache/ScannerTest.php
+++ b/tests/lib/Files/Cache/ScannerTest.php
@ -343,7 +343,7 @@ class ScannerTest extends TestCase {
 		$query = Server::get(IDBConnection::class)->getQueryBuilder();
 		$query->delete('filecache')
 			->where($query->expr()->eq('fileid', $query->createNamedParameter($oldFolderId)));
-		$query->execute();
+		$query->executeStatement();

 		$cachedData = $this->cache->get('folder/bar.txt');
 		$this->assertEquals($oldFolderId, $cachedData['parent']);
@ -369,7 +369,7 @@ class ScannerTest extends TestCase {
 		$query = Server::get(IDBConnection::class)->getQueryBuilder();
 		$query->delete('filecache')
 			->where($query->expr()->eq('fileid', $query->createNamedParameter($oldFolderId)));
-		$query->execute();
+		$query->executeStatement();

 		$cachedData = $this->cache->get('folder/bar.txt');
 		$this->assertEquals($oldFolderId, $cachedData['parent']);
--- a/tests/lib/Files/Cache/SearchBuilderTest.php
+++ b/tests/lib/Files/Cache/SearchBuilderTest.php
@ -84,7 +84,7 @@ class SearchBuilderTest extends TestCase {
 		$builder->delete('filecache')
 			->where($builder->expr()->eq('storage', $builder->createNamedParameter($this->numericStorageId, IQueryBuilder::PARAM_INT)));

-		$builder->execute();
+		$builder->executeStatement();
 	}

 	private function addCacheEntry(array $data) {
@ -121,7 +121,7 @@ class SearchBuilderTest extends TestCase {

 		$builder->insert('filecache')
 			->values($values)
-			->execute();
+			->executeStatement();

 		return $builder->getLastInsertId();
 	}
@ -130,7 +130,7 @@ class SearchBuilderTest extends TestCase {
 		$dbOperator = $this->searchBuilder->searchOperatorToDBExpr($this->builder, $operator);
 		$this->builder->andWhere($dbOperator);

-		$result = $this->builder->execute();
+		$result = $this->builder->executeQuery();
 		$rows = $result->fetchAll(\PDO::FETCH_COLUMN);
 		$result->closeCursor();

--- a/tests/lib/Files/Config/UserMountCacheTest.php
+++ b/tests/lib/Files/Config/UserMountCacheTest.php
@ -81,14 +81,14 @@ class UserMountCacheTest extends TestCase {
 	protected function tearDown(): void {
 		$builder = $this->connection->getQueryBuilder();

-		$builder->delete('mounts')->execute();
+		$builder->delete('mounts')->executeStatement();

 		$builder = $this->connection->getQueryBuilder();

 		foreach ($this->fileIds as $fileId) {
 			$builder->delete('filecache')
 				->where($builder->expr()->eq('fileid', new Literal($fileId)))
-				->execute();
+				->executeStatement();
 		}
 	}

@ -415,7 +415,7 @@ class UserMountCacheTest extends TestCase {
 					->from('filecache')
 					->where($query->expr()->eq('storage', $query->createNamedParameter($storageId)))
 					->andWhere($query->expr()->eq('path_hash', $query->createNamedParameter(md5($internalPath))));
-				$id = (int)$query->execute()->fetchColumn();
+				$id = (int)$query->executeQuery()->fetchColumn();
 			} else {
 				throw $e;
 			}
--- a/tests/lib/Files/Type/LoaderTest.php
+++ b/tests/lib/Files/Type/LoaderTest.php
@ -28,7 +28,7 @@ class LoaderTest extends TestCase {
 			->where($deleteMimetypes->expr()->like(
 				'mimetype', $deleteMimetypes->createPositionalParameter('testing/%')
 			));
-		$deleteMimetypes->execute();
+		$deleteMimetypes->executeStatement();
 	}


@ -38,7 +38,7 @@ class LoaderTest extends TestCase {
 			->values([
 				'mimetype' => $qb->createPositionalParameter('testing/mymimetype')
 			]);
-		$qb->execute();
+		$qb->executeStatement();

 		$this->assertTrue($this->loader->exists('testing/mymimetype'));
 		$mimetypeId = $this->loader->getId('testing/mymimetype');
@ -63,7 +63,7 @@ class LoaderTest extends TestCase {
 			->from('mimetypes')
 			->where($qb->expr()->eq('id', $qb->createPositionalParameter($mimetypeId)));

-		$result = $qb->execute();
+		$result = $qb->executeQuery();
 		$mimetype = $result->fetch();
 		$result->closeCursor();
 		$this->assertEquals('testing/mymimetype', $mimetype['mimetype']);
--- a/tests/lib/Lock/DBLockingProviderTest.php
+++ b/tests/lib/Lock/DBLockingProviderTest.php
@ -59,7 +59,8 @@ class DBLockingProviderTest extends LockingProvider {
 	}

 	protected function tearDown(): void {
-		$this->connection->executeQuery('DELETE FROM `*PREFIX*file_locks`');
+		$qb = $this->connection->getQueryBuilder();
+		$qb->delete('file_locks')->executeStatement();
 		parent::tearDown();
 	}

@ -81,10 +82,12 @@ class DBLockingProviderTest extends LockingProvider {
 		$this->assertEquals(2, $this->getLockEntryCount());
 	}

-	private function getLockEntryCount() {
-		$query = $this->connection->prepare('SELECT count(*) FROM `*PREFIX*file_locks`');
-		$query->execute();
-		return $query->fetchOne();
+	private function getLockEntryCount(): int {
+		$qb = $this->connection->getQueryBuilder();
+		$result = $qb->select($qb->func()->count('*'))
+			->from('file_locks')
+			->executeQuery();
+		return (int)$result->fetchOne();
 	}

 	protected function getLockValue($key) {
@ -93,7 +96,7 @@ class DBLockingProviderTest extends LockingProvider {
 			->from('file_locks')
 			->where($query->expr()->eq('key', $query->createNamedParameter($key)));

-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$rows = $result->fetchOne();
 		$result->closeCursor();

--- a/tests/lib/Share20/DefaultShareProviderTest.php
+++ b/tests/lib/Share20/DefaultShareProviderTest.php
@ -103,7 +103,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 		$this->timeFactory->expects($this->any())->method('now')->willReturn(new \DateTimeImmutable('2023-05-04 00:00 Europe/Berlin'));

 		//Empty share table
-		$this->dbConn->getQueryBuilder()->delete('share')->execute();
+		$this->dbConn->getQueryBuilder()->delete('share')->executeStatement();

 		$this->provider = new DefaultShareProvider(
 			$this->dbConn,
@ -122,9 +122,9 @@ class DefaultShareProviderTest extends \Test\TestCase {
 	}

 	protected function tearDown(): void {
-		$this->dbConn->getQueryBuilder()->delete('share')->execute();
-		$this->dbConn->getQueryBuilder()->delete('filecache')->runAcrossAllShards()->execute();
-		$this->dbConn->getQueryBuilder()->delete('storages')->execute();
+		$this->dbConn->getQueryBuilder()->delete('share')->executeStatement();
+		$this->dbConn->getQueryBuilder()->delete('filecache')->runAcrossAllShards()->executeStatement();
+		$this->dbConn->getQueryBuilder()->delete('storages')->executeStatement();
 	}

 	/**
@ -180,8 +180,8 @@ class DefaultShareProviderTest extends \Test\TestCase {
 			$qb->setValue('parent', $qb->expr()->literal($parent));
 		}

-		$this->assertEquals(1, $qb->execute());
-		return$qb->getLastInsertId();
+		$this->assertEquals(1, $qb->executeStatement());
+		return $qb->getLastInsertId();
 	}


@ -207,7 +207,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget'),
 				'permissions' => $qb->expr()->literal(13),
 			]);
-		$qb->execute();
+		$qb->executeStatement();

 		$id = $qb->getLastInsertId();

@ -254,7 +254,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget'),
 				'permissions' => $qb->expr()->literal(13),
 			]);
-		$qb->execute();
+		$qb->executeStatement();

 		$id = $qb->getLastInsertId();

@ -289,7 +289,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget'),
 				'permissions' => $qb->expr()->literal(13),
 			]);
-		$qb->execute();
+		$qb->executeStatement();

 		$id = $qb->getLastInsertId();

@ -333,7 +333,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget'),
 				'permissions' => $qb->expr()->literal(13),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());

 		// Get the id
 		$id = $qb->getLastInsertId();
@ -419,7 +419,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'token' => $qb->expr()->literal('token'),
 				'expiration' => $qb->expr()->literal('2000-01-02 00:00:00'),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());

 		$id = $qb->getLastInsertId();

@ -461,7 +461,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget'),
 				'permissions' => $qb->expr()->literal(13),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());

 		$id = $qb->getLastInsertId();

@ -493,7 +493,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 		$qb->select('*')
 			->from('share');

-		$cursor = $qb->execute();
+		$cursor = $qb->executeQuery();
 		$result = $cursor->fetchAll();
 		$cursor->closeCursor();

@ -513,7 +513,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget'),
 				'permissions' => $qb->expr()->literal(13),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());

 		$id = $qb->getLastInsertId();

@ -526,7 +526,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 		$qb->select('*')
 			->from('share');

-		$cursor = $qb->execute();
+		$cursor = $qb->executeQuery();
 		$result = $cursor->fetchAll();
 		$cursor->closeCursor();

@ -545,7 +545,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget'),
 				'permissions' => $qb->expr()->literal(13),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());
 		$id = $qb->getLastInsertId();

 		$qb = $this->dbConn->getQueryBuilder();
@ -560,7 +560,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'permissions' => $qb->expr()->literal(13),
 				'parent' => $qb->expr()->literal($id),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());

 		$share = $this->createMock(IShare::class);
 		$share->method('getId')->willReturn($id);
@ -591,7 +591,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 		$qb->select('*')
 			->from('share');

-		$cursor = $qb->execute();
+		$cursor = $qb->executeQuery();
 		$result = $cursor->fetchAll();
 		$cursor->closeCursor();

@ -611,7 +611,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget'),
 				'permissions' => $qb->expr()->literal(13),
 			]);
-		$qb->execute();
+		$qb->executeStatement();

 		// Get the id
 		$id = $qb->getLastInsertId();
@ -629,7 +629,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'permissions' => $qb->expr()->literal(2),
 				'parent' => $qb->expr()->literal($id),
 			]);
-		$qb->execute();
+		$qb->executeStatement();

 		$qb = $this->dbConn->getQueryBuilder();
 		$qb->insert('share')
@ -644,7 +644,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'permissions' => $qb->expr()->literal(4),
 				'parent' => $qb->expr()->literal($id),
 			]);
-		$qb->execute();
+		$qb->executeStatement();

 		$ownerPath = $this->createMock(Folder::class);
 		$ownerFolder = $this->createMock(Folder::class);
@ -900,7 +900,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'token' => $qb->expr()->literal('secrettoken'),
 				'label' => $qb->expr()->literal('the label'),
 			]);
-		$qb->execute();
+		$qb->executeStatement();
 		$id = $qb->getLastInsertId();

 		$file = $this->createMock(File::class);
@ -964,7 +964,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 			->values([
 				'id' => $qb->expr()->literal($storageStringId),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());
 		return $qb->getLastInsertId();
 	}

@ -977,7 +977,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'path_hash' => $qb->createNamedParameter(md5($path)),
 				'name' => $qb->createNamedParameter(basename($path)),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());
 		return $qb->getLastInsertId();
 	}

@ -1009,7 +1009,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget'),
 				'permissions' => $qb->expr()->literal(13),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());
 		$id = $qb->getLastInsertId();

 		$qb = $this->dbConn->getQueryBuilder();
@ -1024,7 +1024,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget2'),
 				'permissions' => $qb->expr()->literal(14),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());

 		$file = $this->createMock(File::class);
 		$this->rootFolder->method('getUserFolder')->with('shareOwner')->willReturnSelf();
@ -1058,7 +1058,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget2'),
 				'permissions' => $qb->expr()->literal(14),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());

 		$qb = $this->dbConn->getQueryBuilder();
 		$qb->insert('share')
@ -1072,7 +1072,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget'),
 				'permissions' => $qb->expr()->literal(13),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());
 		$id = $qb->getLastInsertId();

 		$groups = [];
@ -1129,7 +1129,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget'),
 				'permissions' => $qb->expr()->literal(13),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());
 		$id = $qb->getLastInsertId();

 		/*
@ -1148,7 +1148,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'permissions' => $qb->expr()->literal(31),
 				'parent' => $qb->expr()->literal($id),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());

 		/*
 		 * Correct share. should be taken by code path.
@ -1166,7 +1166,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'permissions' => $qb->expr()->literal(0),
 				'parent' => $qb->expr()->literal($id),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());

 		$groups = ['sharedWith'];

@ -1315,7 +1315,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget'),
 				'permissions' => $qb->expr()->literal(13),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());

 		$file = $this->createMock(File::class);
 		$this->rootFolder->method('getUserFolder')->with('shareOwner')->willReturnSelf();
@ -1361,7 +1361,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget'),
 				'permissions' => $qb->expr()->literal(13),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());
 		$id = $qb->getLastInsertId();

 		$qb = $this->dbConn->getQueryBuilder();
@ -1377,7 +1377,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'permissions' => $qb->expr()->literal(0),
 				'parent' => $qb->expr()->literal($id),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());

 		$file = $this->createMock(File::class);
 		$this->rootFolder->method('getUserFolder')->with('shareOwner')->willReturnSelf();
@ -1410,7 +1410,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget'),
 				'permissions' => $qb->expr()->literal(13),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());
 		$id = $qb->getLastInsertId();

 		$qb = $this->dbConn->getQueryBuilder();
@ -1426,7 +1426,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'permissions' => $qb->expr()->literal(0),
 				'parent' => $qb->expr()->literal($id),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());

 		$file = $this->createMock(File::class);
 		$file->method('getId')->willReturn(42);
@ -1460,7 +1460,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget'),
 				'permissions' => $qb->expr()->literal(13),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());
 		$id1 = $qb->getLastInsertId();

 		$qb = $this->dbConn->getQueryBuilder();
@ -1475,7 +1475,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('userTarget'),
 				'permissions' => $qb->expr()->literal(0),
 			]);
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());
 		$id2 = $qb->getLastInsertId();

 		$file = $this->createMock(File::class);
@ -1518,7 +1518,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_source' => $qb->expr()->literal(1),
 				'file_target' => $qb->expr()->literal('myTarget1'),
 				'permissions' => $qb->expr()->literal(2)
-			])->execute();
+			])->executeStatement();
 		$this->assertEquals(1, $stmt);
 		$id = $qb->getLastInsertId();

@ -1551,7 +1551,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 		$stmt = $qb->select('*')
 			->from('share')
 			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(2)))
-			->execute();
+			->executeQuery();

 		$shares = $stmt->fetchAll();
 		$stmt->closeCursor();
@ -1575,7 +1575,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_source' => $qb->expr()->literal(1),
 				'file_target' => $qb->expr()->literal('myTarget1'),
 				'permissions' => $qb->expr()->literal(2)
-			])->execute();
+			])->executeStatement();
 		$this->assertEquals(1, $stmt);
 		$id = $qb->getLastInsertId();

@ -1591,7 +1591,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget1'),
 				'permissions' => $qb->expr()->literal(2),
 				'parent' => $qb->expr()->literal($id),
-			])->execute();
+			])->executeStatement();
 		$this->assertEquals(1, $stmt);

 		$user1 = $this->createMock(IUser::class);
@ -1623,7 +1623,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 		$stmt = $qb->select('*')
 			->from('share')
 			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(2)))
-			->execute();
+			->executeQuery();

 		$shares = $stmt->fetchAll();
 		$stmt->closeCursor();
@ -1648,7 +1648,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_source' => $qb->expr()->literal(1),
 				'file_target' => $qb->expr()->literal('myTarget1'),
 				'permissions' => $qb->expr()->literal(2)
-			])->execute();
+			])->executeStatement();
 		$this->assertEquals(1, $stmt);
 		$id = $qb->getLastInsertId();

@ -1694,7 +1694,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_source' => $qb->expr()->literal(1),
 				'file_target' => $qb->expr()->literal('myTarget1'),
 				'permissions' => $qb->expr()->literal(2)
-			])->execute();
+			])->executeStatement();
 		$this->assertEquals(1, $stmt);
 		$id = $qb->getLastInsertId();

@ -1732,7 +1732,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_source' => $qb->expr()->literal(1),
 				'file_target' => $qb->expr()->literal('myTarget1'),
 				'permissions' => $qb->expr()->literal(2)
-			])->execute();
+			])->executeStatement();
 		$this->assertEquals(1, $stmt);
 		$id = $qb->getLastInsertId();

@ -1761,7 +1761,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 		$stmt = $qb->select('*')
 			->from('share')
 			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->execute();
+			->executeQuery();

 		$shares = $stmt->fetchAll();
 		$stmt->closeCursor();
@ -1785,7 +1785,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_source' => $qb->expr()->literal(1),
 				'file_target' => $qb->expr()->literal('myTarget1'),
 				'permissions' => $qb->expr()->literal(2)
-			])->execute();
+			])->executeStatement();
 		$this->assertEquals(1, $stmt);
 		$id = $qb->getLastInsertId();

@ -1828,7 +1828,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget1'),
 				'permissions' => $qb->expr()->literal(2),
 				'token' => $qb->expr()->literal('token'),
-			])->execute();
+			])->executeStatement();
 		$this->assertEquals(1, $stmt);
 		$id = $qb->getLastInsertId();

@ -1975,7 +1975,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 		$qb->update('share');
 		$qb->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
 		$qb->set('password', $qb->createNamedParameter('password'));
-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());

 		$users = [];
 		for ($i = 0; $i < 6; $i++) {
@ -2186,7 +2186,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 			->from('share')
 			->where($qb->expr()->eq('parent', $qb->createNamedParameter($id)))
 			->orderBy('id')
-			->execute();
+			->executeQuery();

 		$shares = $stmt->fetchAll();

@ -2316,7 +2316,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 			->setValue('item_type', $qb->createNamedParameter('file'))
 			->setValue('item_source', $qb->createNamedParameter(42))
 			->setValue('file_source', $qb->createNamedParameter(42))
-			->execute();
+			->executeStatement();

 		$id = $qb->getLastInsertId();

@ -2328,7 +2328,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 			->where(
 				$qb->expr()->eq('id', $qb->createNamedParameter($id))
 			);
-		$cursor = $qb->execute();
+		$cursor = $qb->executeQuery();
 		$data = $cursor->fetchAll();
 		$cursor->closeCursor();

@ -2364,7 +2364,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 			->setValue('item_type', $qb->createNamedParameter('file'))
 			->setValue('item_source', $qb->createNamedParameter(42))
 			->setValue('file_source', $qb->createNamedParameter(42))
-			->execute();
+			->executeStatement();
 		$groupId = $qb->getLastInsertId();

 		$qb = $this->dbConn->getQueryBuilder();
@ -2376,7 +2376,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 			->setValue('item_type', $qb->createNamedParameter('file'))
 			->setValue('item_source', $qb->createNamedParameter(42))
 			->setValue('file_source', $qb->createNamedParameter(42))
-			->execute();
+			->executeStatement();
 		$userGroupId = $qb->getLastInsertId();

 		$this->provider->userDeleted($deletedUser, IShare::TYPE_GROUP);
@ -2387,7 +2387,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 			->where(
 				$qb->expr()->eq('id', $qb->createNamedParameter($userGroupId))
 			);
-		$cursor = $qb->execute();
+		$cursor = $qb->executeQuery();
 		$data = $cursor->fetchAll();
 		$cursor->closeCursor();
 		$this->assertCount($userGroupShareDeleted ? 0 : 1, $data);
@ -2398,7 +2398,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 			->where(
 				$qb->expr()->eq('id', $qb->createNamedParameter($groupId))
 			);
-		$cursor = $qb->execute();
+		$cursor = $qb->executeQuery();
 		$data = $cursor->fetchAll();
 		$cursor->closeCursor();
 		$this->assertCount($groupShareDeleted ? 0 : 1, $data);
@ -2467,7 +2467,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 			->setValue('item_type', $qb->createNamedParameter('file'))
 			->setValue('item_source', $qb->createNamedParameter(42))
 			->setValue('file_source', $qb->createNamedParameter(42))
-			->execute();
+			->executeStatement();
 		$ids = [$qb->getLastInsertId()];

 		foreach ($shares['children'] as $child) {
@ -2481,7 +2481,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				->setValue('item_source', $qb->createNamedParameter(42))
 				->setValue('file_source', $qb->createNamedParameter(42))
 				->setValue('parent', $qb->createNamedParameter($ids[0]))
-				->execute();
+				->executeStatement();
 			$ids[] = $qb->getLastInsertId();
 		}

@ -2491,7 +2491,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 		$cursor = $qb->select('*')
 			->from('share')
 			->where($qb->expr()->in('id', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
-			->execute();
+			->executeQuery();
 		$data = $cursor->fetchAll();
 		$cursor->closeCursor();

@ -2527,7 +2527,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 			->setValue('item_type', $qb->createNamedParameter('file'))
 			->setValue('item_source', $qb->createNamedParameter(42))
 			->setValue('file_source', $qb->createNamedParameter(42));
-		$qb->execute();
+		$qb->executeStatement();
 		$id1 = $qb->getLastInsertId();

 		$qb = $this->dbConn->getQueryBuilder();
@ -2540,7 +2540,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 			->setValue('item_source', $qb->createNamedParameter(42))
 			->setValue('file_source', $qb->createNamedParameter(42))
 			->setValue('parent', $qb->createNamedParameter($id1));
-		$qb->execute();
+		$qb->executeStatement();
 		$id2 = $qb->getLastInsertId();

 		$this->provider->userDeletedFromGroup($user, $group);
@ -2549,7 +2549,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 		$qb->select('*')
 			->from('share')
 			->where($qb->expr()->eq('id', $qb->createNamedParameter($id2)));
-		$cursor = $qb->execute();
+		$cursor = $qb->executeQuery();
 		$data = $cursor->fetchAll();
 		$cursor->closeCursor();

@ -2877,7 +2877,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget1'),
 				'permissions' => $qb->expr()->literal(13),
 			]);
-		$qb->execute();
+		$qb->executeStatement();

 		$id1 = $qb->getLastInsertId();

@ -2892,7 +2892,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget2'),
 				'permissions' => $qb->expr()->literal(14),
 			]);
-		$qb->execute();
+		$qb->executeStatement();

 		$id2 = $qb->getLastInsertId();

@ -2907,7 +2907,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget3'),
 				'permissions' => $qb->expr()->literal(15),
 			]);
-		$qb->execute();
+		$qb->executeStatement();

 		$id3 = $qb->getLastInsertId();

@ -2923,7 +2923,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget4'),
 				'permissions' => $qb->expr()->literal(16),
 			]);
-		$qb->execute();
+		$qb->executeStatement();

 		$id4 = $qb->getLastInsertId();

@ -2938,7 +2938,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'file_target' => $qb->expr()->literal('myTarget5'),
 				'permissions' => $qb->expr()->literal(17),
 			]);
-		$qb->execute();
+		$qb->executeStatement();

 		$id5 = $qb->getLastInsertId();

@ -3041,7 +3041,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'item_type' => $qb->expr()->literal('file'),
 				'file_source' => $qb->expr()->literal(1),
 			]);
-		$qb->execute();
+		$qb->executeStatement();

 		$id1 = $qb->getLastInsertId();

@ -3054,7 +3054,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'item_type' => $qb->expr()->literal('file'),
 				'file_source' => $qb->expr()->literal(1),
 			]);
-		$qb->execute();
+		$qb->executeStatement();

 		$id2 = $qb->getLastInsertId();

@ -3067,7 +3067,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
 				'item_type' => $qb->expr()->literal('file'),
 				'file_source' => $qb->expr()->literal(1),
 			]);
-		$qb->execute();
+		$qb->executeStatement();

 		$id3 = $qb->getLastInsertId();

--- a/tests/lib/Share20/ShareByMailProviderTest.php
+++ b/tests/lib/Share20/ShareByMailProviderTest.php
@ -103,7 +103,7 @@ class ShareByMailProviderTest extends TestCase {
 		$this->config = $this->createMock(IConfig::class);

 		// Empty share table
-		$this->dbConn->getQueryBuilder()->delete('share')->execute();
+		$this->dbConn->getQueryBuilder()->delete('share')->executeStatement();

 		$this->provider = new ShareByMailProvider(
 			$this->config,
@ -125,9 +125,9 @@ class ShareByMailProviderTest extends TestCase {
 	}

 	protected function tearDown(): void {
-		$this->dbConn->getQueryBuilder()->delete('share')->execute();
-		$this->dbConn->getQueryBuilder()->delete('filecache')->runAcrossAllShards()->execute();
-		$this->dbConn->getQueryBuilder()->delete('storages')->execute();
+		$this->dbConn->getQueryBuilder()->delete('share')->executeStatement();
+		$this->dbConn->getQueryBuilder()->delete('filecache')->runAcrossAllShards()->executeStatement();
+		$this->dbConn->getQueryBuilder()->delete('storages')->executeStatement();
 	}

 	/**
@ -186,7 +186,7 @@ class ShareByMailProviderTest extends TestCase {
 			$qb->setValue('parent', $qb->expr()->literal($parent));
 		}

-		$this->assertEquals(1, $qb->execute());
+		$this->assertEquals(1, $qb->executeStatement());
 		return $qb->getLastInsertId();
 	}

--- a/tests/lib/SubAdminTest.php
+++ b/tests/lib/SubAdminTest.php
@ -71,19 +71,19 @@ class SubAdminTest extends \Test\TestCase {
 				'gid' => $qb->createNamedParameter($this->groups[0]->getGID()),
 				'uid' => $qb->createNamedParameter('orphanedUser')
 			])
-			->execute();
+			->executeStatement();
 		$qb->insert('group_admin')
 			->values([
 				'gid' => $qb->createNamedParameter('orphanedGroup'),
 				'uid' => $qb->createNamedParameter('orphanedUser')
 			])
-			->execute();
+			->executeStatement();
 		$qb->insert('group_admin')
 			->values([
 				'gid' => $qb->createNamedParameter('orphanedGroup'),
 				'uid' => $qb->createNamedParameter($this->users[0]->getUID())
 			])
-			->execute();
+			->executeStatement();
 	}

 	protected function tearDown(): void {
@ -99,7 +99,7 @@ class SubAdminTest extends \Test\TestCase {
 		$qb->delete('group_admin')
 			->where($qb->expr()->eq('uid', $qb->createNamedParameter('orphanedUser')))
 			->orWhere($qb->expr()->eq('gid', $qb->createNamedParameter('orphanedGroup')))
-			->execute();
+			->executeStatement();
 	}

 	public function testCreateSubAdmin(): void {
@ -112,7 +112,7 @@ class SubAdminTest extends \Test\TestCase {
 			->from('group_admin')
 			->where($qb->expr()->eq('gid', $qb->createNamedParameter($this->groups[0]->getGID())))
 			->andWHere($qb->expr()->eq('uid', $qb->createNamedParameter($this->users[0]->getUID())))
-			->execute()
+			->executeQuery()
 			->fetch();
 		$this->assertEquals(
 			[
@ -121,10 +121,10 @@ class SubAdminTest extends \Test\TestCase {
 			], $result);

 		// Delete subadmin
-		$result = $qb->delete('*PREFIX*group_admin')
+		$qb->delete('group_admin')
 			->where($qb->expr()->eq('gid', $qb->createNamedParameter($this->groups[0]->getGID())))
 			->andWHere($qb->expr()->eq('uid', $qb->createNamedParameter($this->users[0]->getUID())))
-			->execute();
+			->executeStatement();
 	}

 	public function testDeleteSubAdmin(): void {
@ -138,7 +138,7 @@ class SubAdminTest extends \Test\TestCase {
 			->from('group_admin')
 			->where($qb->expr()->eq('gid', $qb->createNamedParameter($this->groups[0]->getGID())))
 			->andWHere($qb->expr()->eq('uid', $qb->createNamedParameter($this->users[0]->getUID())))
-			->execute()
+			->executeQuery()
 			->fetch();
 		$this->assertEmpty($result);
 	}
--- a/tests/lib/SystemTag/SystemTagManagerTest.php
+++ b/tests/lib/SystemTag/SystemTagManagerTest.php
@ -65,8 +65,8 @@ class SystemTagManagerTest extends TestCase {

 	protected function pruneTagsTables() {
 		$query = $this->connection->getQueryBuilder();
-		$query->delete(SystemTagObjectMapper::RELATION_TABLE)->execute();
-		$query->delete(SystemTagManager::TAG_TABLE)->execute();
+		$query->delete(SystemTagObjectMapper::RELATION_TABLE)->executeStatement();
+		$query->delete(SystemTagManager::TAG_TABLE)->executeStatement();
 	}

 	public static function getAllTagsDataProvider(): array {
--- a/tests/lib/SystemTag/SystemTagObjectMapperTest.php
+++ b/tests/lib/SystemTag/SystemTagObjectMapperTest.php
@ -110,8 +110,8 @@ class SystemTagObjectMapperTest extends TestCase {

 	protected function pruneTagsTables() {
 		$query = $this->connection->getQueryBuilder();
-		$query->delete(SystemTagObjectMapper::RELATION_TABLE)->execute();
-		$query->delete(SystemTagManager::TAG_TABLE)->execute();
+		$query->delete(SystemTagObjectMapper::RELATION_TABLE)->executeStatement();
+		$query->delete(SystemTagManager::TAG_TABLE)->executeStatement();
 	}

 	public function testGetTagIdsForObjects(): void {
--- a/tests/lib/TestCase.php
+++ b/tests/lib/TestCase.php
@ -363,7 +363,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase {
 	 */
 	protected static function tearDownAfterClassCleanShares(IQueryBuilder $queryBuilder) {
 		$queryBuilder->delete('share')
-			->execute();
+			->executeStatement();
 	}

 	/**
@ -373,7 +373,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase {
 	 */
 	protected static function tearDownAfterClassCleanStorages(IQueryBuilder $queryBuilder) {
 		$queryBuilder->delete('storages')
-			->execute();
+			->executeStatement();
 	}

 	/**
@ -384,7 +384,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase {
 	protected static function tearDownAfterClassCleanFileCache(IQueryBuilder $queryBuilder) {
 		$queryBuilder->delete('filecache')
 			->runAcrossAllShards()
-			->execute();
+			->executeStatement();
 	}

 	/**