nextcloud / server

core/Application.php

Indentation +104 added lines, -104 removed lines

@@ -43,108 +43,108 @@
  */
 class Application extends App {
 
-	public function __construct() {
-		parent::__construct('core');
-
-		$container = $this->getContainer();
-
-		$container->registerService('defaultMailAddress', function () {
-			return Util::getDefaultEmailAddress('lostpassword-noreply');
-		});
-
-		$server = $container->getServer();
-		$eventDispatcher = $server->getEventDispatcher();
-
-		$notificationManager = $server->getNotificationManager();
-		$notificationManager->registerNotifier(function() use ($server) {
-			return new RemoveLinkSharesNotifier(
-				$server->getL10NFactory()
-			);
-		},  function() use ($server) {
-			return [
-				'id' => 'core',
-				'name' => 'core',
-			];
-		});
-
-		$eventDispatcher->addListener(IDBConnection::CHECK_MISSING_INDEXES_EVENT,
-			function(GenericEvent $event) use ($container) {
-				/** @var MissingIndexInformation $subject */
-				$subject = $event->getSubject();
-
-				$schema = new SchemaWrapper($container->query(IDBConnection::class));
-
-				if ($schema->hasTable('share')) {
-					$table = $schema->getTable('share');
-
-					if (!$table->hasIndex('share_with_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'share_with_index');
-					}
-					if (!$table->hasIndex('parent_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'parent_index');
-					}
-					if (!$table->hasIndex('owner_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'owner_index');
-					}
-					if (!$table->hasIndex('initiator_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'initiator_index');
-					}
-				}
-
-				if ($schema->hasTable('filecache')) {
-					$table = $schema->getTable('filecache');
-
-					if (!$table->hasIndex('fs_mtime')) {
-						$subject->addHintForMissingSubject($table->getName(), 'fs_mtime');
-					}
-				}
-
-				if ($schema->hasTable('twofactor_providers')) {
-					$table = $schema->getTable('twofactor_providers');
-
-					if (!$table->hasIndex('twofactor_providers_uid')) {
-						$subject->addHintForMissingSubject($table->getName(), 'twofactor_providers_uid');
-					}
-				}
-
-				if ($schema->hasTable('login_flow_v2')) {
-					$table = $schema->getTable('login_flow_v2');
-
-					if (!$table->hasIndex('poll_token')) {
-						$subject->addHintForMissingSubject($table->getName(), 'poll_token');
-					}
-					if (!$table->hasIndex('login_token')) {
-						$subject->addHintForMissingSubject($table->getName(), 'login_token');
-					}
-					if (!$table->hasIndex('timestamp')) {
-						$subject->addHintForMissingSubject($table->getName(), 'timestamp');
-					}
-				}
-
-				if ($schema->hasTable('whats_new')) {
-					$table = $schema->getTable('whats_new');
-
-					if (!$table->hasIndex('version')) {
-						$subject->addHintForMissingSubject($table->getName(), 'version');
-					}
-				}
-
-				if ($schema->hasTable('cards')) {
-					$table = $schema->getTable('cards');
-
-					if (!$table->hasIndex('cards_abid')) {
-						$subject->addHintForMissingSubject($table->getName(), 'cards_abid');
-					}
-				}
-
-				if ($schema->hasTable('cards_properties')) {
-					$table = $schema->getTable('cards_properties');
-
-					if (!$table->hasIndex('cards_prop_abid')) {
-						$subject->addHintForMissingSubject($table->getName(), 'cards_prop_abid');
-					}
-				}
-			}
-		);
-	}
+    public function __construct() {
+        parent::__construct('core');
+
+        $container = $this->getContainer();
+
+        $container->registerService('defaultMailAddress', function () {
+            return Util::getDefaultEmailAddress('lostpassword-noreply');
+        });
+
+        $server = $container->getServer();
+        $eventDispatcher = $server->getEventDispatcher();
+
+        $notificationManager = $server->getNotificationManager();
+        $notificationManager->registerNotifier(function() use ($server) {
+            return new RemoveLinkSharesNotifier(
+                $server->getL10NFactory()
+            );
+        },  function() use ($server) {
+            return [
+                'id' => 'core',
+                'name' => 'core',
+            ];
+        });
+
+        $eventDispatcher->addListener(IDBConnection::CHECK_MISSING_INDEXES_EVENT,
+            function(GenericEvent $event) use ($container) {
+                /** @var MissingIndexInformation $subject */
+                $subject = $event->getSubject();
+
+                $schema = new SchemaWrapper($container->query(IDBConnection::class));
+
+                if ($schema->hasTable('share')) {
+                    $table = $schema->getTable('share');
+
+                    if (!$table->hasIndex('share_with_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'share_with_index');
+                    }
+                    if (!$table->hasIndex('parent_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'parent_index');
+                    }
+                    if (!$table->hasIndex('owner_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'owner_index');
+                    }
+                    if (!$table->hasIndex('initiator_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'initiator_index');
+                    }
+                }
+
+                if ($schema->hasTable('filecache')) {
+                    $table = $schema->getTable('filecache');
+
+                    if (!$table->hasIndex('fs_mtime')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'fs_mtime');
+                    }
+                }
+
+                if ($schema->hasTable('twofactor_providers')) {
+                    $table = $schema->getTable('twofactor_providers');
+
+                    if (!$table->hasIndex('twofactor_providers_uid')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'twofactor_providers_uid');
+                    }
+                }
+
+                if ($schema->hasTable('login_flow_v2')) {
+                    $table = $schema->getTable('login_flow_v2');
+
+                    if (!$table->hasIndex('poll_token')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'poll_token');
+                    }
+                    if (!$table->hasIndex('login_token')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'login_token');
+                    }
+                    if (!$table->hasIndex('timestamp')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'timestamp');
+                    }
+                }
+
+                if ($schema->hasTable('whats_new')) {
+                    $table = $schema->getTable('whats_new');
+
+                    if (!$table->hasIndex('version')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'version');
+                    }
+                }
+
+                if ($schema->hasTable('cards')) {
+                    $table = $schema->getTable('cards');
+
+                    if (!$table->hasIndex('cards_abid')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'cards_abid');
+                    }
+                }
+
+                if ($schema->hasTable('cards_properties')) {
+                    $table = $schema->getTable('cards_properties');
+
+                    if (!$table->hasIndex('cards_prop_abid')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'cards_prop_abid');
+                    }
+                }
+            }
+        );
+    }
 }

core/Notification/RemoveLinkSharesNotifier.php

Indentation +22 added lines, -22 removed lines

@@ -29,27 +29,27 @@
 use OCP\Notification\INotifier;
 
 class RemoveLinkSharesNotifier implements INotifier {
-	/** @var IFactory */
-	private $l10nFactory;
-
-	public function __construct(IFactory $factory) {
-		$this->l10nFactory = $factory;
-	}
-
-	public function prepare(INotification $notification, $languageCode): INotification {
-		if($notification->getApp() !== 'core') {
-			throw new \InvalidArgumentException();
-		}
-		$l = $this->l10nFactory->get('core', $languageCode);
-
-		if ($notification->getSubject() === 'repair_exposing_links') {
-			$notification->setParsedSubject($l->t('Some of your link shares have been removed'));
-			$notification->setParsedMessage($l->t('Due to a security bug we had to remove some of your link shares. Please see the link for more information.'));
-			$notification->setLink('https://nextcloud.com/security/advisory/?id=NC-SA-2019-003');
-			return $notification;
-		}
-
-		throw new \InvalidArgumentException('Invalid subject');
-	}
+    /** @var IFactory */
+    private $l10nFactory;
+
+    public function __construct(IFactory $factory) {
+        $this->l10nFactory = $factory;
+    }
+
+    public function prepare(INotification $notification, $languageCode): INotification {
+        if($notification->getApp() !== 'core') {
+            throw new \InvalidArgumentException();
+        }
+        $l = $this->l10nFactory->get('core', $languageCode);
+
+        if ($notification->getSubject() === 'repair_exposing_links') {
+            $notification->setParsedSubject($l->t('Some of your link shares have been removed'));
+            $notification->setParsedMessage($l->t('Due to a security bug we had to remove some of your link shares. Please see the link for more information.'));
+            $notification->setLink('https://nextcloud.com/security/advisory/?id=NC-SA-2019-003');
+            return $notification;
+        }
+
+        throw new \InvalidArgumentException('Invalid subject');
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	}
 
 	public function prepare(INotification $notification, $languageCode): INotification {
-		if($notification->getApp() !== 'core') {
+		if ($notification->getApp() !== 'core') {
 			throw new \InvalidArgumentException();
 		}
 		$l = $this->l10nFactory->get('core', $languageCode);

lib/private/Repair/RemoveLinkShares.php

Indentation +198 added lines, -198 removed lines

@@ -35,202 +35,202 @@
 use OCP\Notification\IManager;
 
 class RemoveLinkShares implements IRepairStep {
-	/** @var IDBConnection */
-	private $connection;
-	/** @var IConfig */
-	private $config;
-	/** @var string[] */
-	private $userToNotify = [];
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IManager */
-	private $notificationManager;
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	public function __construct(IDBConnection $connection,
-								IConfig $config,
-								IGroupManager $groupManager,
-								IManager $notificationManager,
-								ITimeFactory $timeFactory) {
-		$this->connection = $connection;
-		$this->config = $config;
-		$this->groupManager = $groupManager;
-		$this->notificationManager = $notificationManager;
-		$this->timeFactory = $timeFactory;
-	}
-
-
-	public function getName(): string {
-		return 'Remove potentially over exposing share links';
-	}
-
-	private function shouldRun(): bool {
-		$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
-
-		if (version_compare($versionFromBeforeUpdate, '14.0.11', '<')) {
-			return true;
-		}
-		if (version_compare($versionFromBeforeUpdate, '15.0.8', '<')) {
-			return true;
-		}
-		if (version_compare($versionFromBeforeUpdate, '16.0.0', '<=')) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Delete the share
-	 *
-	 * @param int $id
-	 */
-	private function deleteShare(int $id): void {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->delete('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
-		$qb->execute();
-	}
-
-	/**
-	 * Get the total of affected shares
-	 *
-	 * @return int
-	 */
-	private function getTotal(): int {
-		$subSubQuery = $this->connection->getQueryBuilder();
-		$subSubQuery->select('*')
-			->from('share')
-			->where($subSubQuery->expr()->isNotNull('parent'))
-			->andWhere($subSubQuery->expr()->eq('share_type', $subSubQuery->expr()->literal(3, IQueryBuilder::PARAM_INT)));
-
-		$subQuery = $this->connection->getQueryBuilder();
-		$subQuery->select('s1.id')
-			->from($subQuery->createFunction('(' . $subSubQuery->getSQL() . ')'), 's1')
-			->join(
-				's1', 'share', 's2',
-				$subQuery->expr()->eq('s1.parent', 's2.id')
-			)
-			->where($subQuery->expr()->orX(
-				$subQuery->expr()->eq('s2.share_type', $subQuery->expr()->literal(1, IQueryBuilder::PARAM_INT)),
-				$subQuery->expr()->eq('s2.share_type', $subQuery->expr()->literal(2, IQueryBuilder::PARAM_INT))
-			))
-			->andWhere($subQuery->expr()->eq('s1.item_source', 's2.item_source'));
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select($query->func()->count('*', 'total'))
-			->from('share')
-			->where($query->expr()->in('id', $query->createFunction('(' . $subQuery->getSQL() . ')')));
-
-		$result = $query->execute();
-		$data = $result->fetch();
-		$result->closeCursor();
-
-		return (int) $data['total'];
-	}
-
-	/**
-	 * Get the cursor to fetch all the shares
-	 *
-	 * @return \Doctrine\DBAL\Driver\Statement
-	 */
-	private function getShares(): Statement {
-		$subQuery = $this->connection->getQueryBuilder();
-		$subQuery->select('*')
-			->from('share')
-			->where($subQuery->expr()->isNotNull('parent'))
-			->andWhere($subQuery->expr()->eq('share_type', $subQuery->expr()->literal(3, IQueryBuilder::PARAM_INT)));
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('s1.id', 's1.uid_owner', 's1.uid_initiator')
-			->from($query->createFunction('(' . $subQuery->getSQL() . ')'), 's1')
-			->join(
-				's1', 'share', 's2',
-				$query->expr()->eq('s1.parent', 's2.id')
-			)
-			->where($query->expr()->orX(
-				$query->expr()->eq('s2.share_type', $query->expr()->literal(1, IQueryBuilder::PARAM_INT)),
-				$query->expr()->eq('s2.share_type', $query->expr()->literal(2, IQueryBuilder::PARAM_INT))
-			))
-			->andWhere($query->expr()->eq('s1.item_source', 's2.item_source'));
-		return $query->execute();
-	}
-
-	/**
-	 * Process a single share
-	 *
-	 * @param array $data
-	 */
-	private function processShare(array $data): void {
-		$id = $data['id'];
-
-		$this->addToNotify($data['uid_owner']);
-		$this->addToNotify($data['uid_initiator']);
-
-		$this->deleteShare((int)$id);
-	}
-
-	/**
-	 * Update list of users to notify
-	 *
-	 * @param string $uid
-	 */
-	private function addToNotify(string $uid): void {
-		if (!isset($this->userToNotify[$uid])) {
-			$this->userToNotify[$uid] = true;
-		}
-	}
-
-	/**
-	 * Send all notifications
-	 */
-	private function sendNotification(): void {
-		$time = $this->timeFactory->getDateTime();
-
-		$notification = $this->notificationManager->createNotification();
-		$notification->setApp('core')
-			->setDateTime($time)
-			->setObject('repair', 'exposing_links')
-			->setSubject('repair_exposing_links');
-
-		$users = array_keys($this->userToNotify);
-		foreach ($users as $user) {
-			$notification->setUser($user);
-			$this->notificationManager->notify($notification);
-		}
-	}
-
-	private function repair(IOutput $output): void {
-		$total = $this->getTotal();
-		$output->startProgress($total);
-
-		$shareCursor = $this->getShares();
-		while($data = $shareCursor->fetch()) {
-			$this->processShare($data);
-			$output->advance();
-		}
-		$output->finishProgress();
-		$shareCursor->closeCursor();
-
-		// Notifiy all admins
-		$adminGroup = $this->groupManager->get('admin');
-		$adminUsers = $adminGroup->getUsers();
-		foreach ($adminUsers as $user) {
-			$this->addToNotify($user->getUID());
-		}
-
-		$output->info('Sending notifications to admins and affected users');
-		$this->sendNotification();
-	}
-
-	public function run(IOutput $output): void {
-		if ($this->shouldRun()) {
-			$output->info('Removing potentially over exposing link shares');
-			$this->repair($output);
-			$output->info('Removed potentially over exposing link shares');
-		} else {
-			$output->info('No need to remove link shares.');
-		}
-	}
+    /** @var IDBConnection */
+    private $connection;
+    /** @var IConfig */
+    private $config;
+    /** @var string[] */
+    private $userToNotify = [];
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IManager */
+    private $notificationManager;
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    public function __construct(IDBConnection $connection,
+                                IConfig $config,
+                                IGroupManager $groupManager,
+                                IManager $notificationManager,
+                                ITimeFactory $timeFactory) {
+        $this->connection = $connection;
+        $this->config = $config;
+        $this->groupManager = $groupManager;
+        $this->notificationManager = $notificationManager;
+        $this->timeFactory = $timeFactory;
+    }
+
+
+    public function getName(): string {
+        return 'Remove potentially over exposing share links';
+    }
+
+    private function shouldRun(): bool {
+        $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+
+        if (version_compare($versionFromBeforeUpdate, '14.0.11', '<')) {
+            return true;
+        }
+        if (version_compare($versionFromBeforeUpdate, '15.0.8', '<')) {
+            return true;
+        }
+        if (version_compare($versionFromBeforeUpdate, '16.0.0', '<=')) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Delete the share
+     *
+     * @param int $id
+     */
+    private function deleteShare(int $id): void {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->delete('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
+        $qb->execute();
+    }
+
+    /**
+     * Get the total of affected shares
+     *
+     * @return int
+     */
+    private function getTotal(): int {
+        $subSubQuery = $this->connection->getQueryBuilder();
+        $subSubQuery->select('*')
+            ->from('share')
+            ->where($subSubQuery->expr()->isNotNull('parent'))
+            ->andWhere($subSubQuery->expr()->eq('share_type', $subSubQuery->expr()->literal(3, IQueryBuilder::PARAM_INT)));
+
+        $subQuery = $this->connection->getQueryBuilder();
+        $subQuery->select('s1.id')
+            ->from($subQuery->createFunction('(' . $subSubQuery->getSQL() . ')'), 's1')
+            ->join(
+                's1', 'share', 's2',
+                $subQuery->expr()->eq('s1.parent', 's2.id')
+            )
+            ->where($subQuery->expr()->orX(
+                $subQuery->expr()->eq('s2.share_type', $subQuery->expr()->literal(1, IQueryBuilder::PARAM_INT)),
+                $subQuery->expr()->eq('s2.share_type', $subQuery->expr()->literal(2, IQueryBuilder::PARAM_INT))
+            ))
+            ->andWhere($subQuery->expr()->eq('s1.item_source', 's2.item_source'));
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select($query->func()->count('*', 'total'))
+            ->from('share')
+            ->where($query->expr()->in('id', $query->createFunction('(' . $subQuery->getSQL() . ')')));
+
+        $result = $query->execute();
+        $data = $result->fetch();
+        $result->closeCursor();
+
+        return (int) $data['total'];
+    }
+
+    /**
+     * Get the cursor to fetch all the shares
+     *
+     * @return \Doctrine\DBAL\Driver\Statement
+     */
+    private function getShares(): Statement {
+        $subQuery = $this->connection->getQueryBuilder();
+        $subQuery->select('*')
+            ->from('share')
+            ->where($subQuery->expr()->isNotNull('parent'))
+            ->andWhere($subQuery->expr()->eq('share_type', $subQuery->expr()->literal(3, IQueryBuilder::PARAM_INT)));
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('s1.id', 's1.uid_owner', 's1.uid_initiator')
+            ->from($query->createFunction('(' . $subQuery->getSQL() . ')'), 's1')
+            ->join(
+                's1', 'share', 's2',
+                $query->expr()->eq('s1.parent', 's2.id')
+            )
+            ->where($query->expr()->orX(
+                $query->expr()->eq('s2.share_type', $query->expr()->literal(1, IQueryBuilder::PARAM_INT)),
+                $query->expr()->eq('s2.share_type', $query->expr()->literal(2, IQueryBuilder::PARAM_INT))
+            ))
+            ->andWhere($query->expr()->eq('s1.item_source', 's2.item_source'));
+        return $query->execute();
+    }
+
+    /**
+     * Process a single share
+     *
+     * @param array $data
+     */
+    private function processShare(array $data): void {
+        $id = $data['id'];
+
+        $this->addToNotify($data['uid_owner']);
+        $this->addToNotify($data['uid_initiator']);
+
+        $this->deleteShare((int)$id);
+    }
+
+    /**
+     * Update list of users to notify
+     *
+     * @param string $uid
+     */
+    private function addToNotify(string $uid): void {
+        if (!isset($this->userToNotify[$uid])) {
+            $this->userToNotify[$uid] = true;
+        }
+    }
+
+    /**
+     * Send all notifications
+     */
+    private function sendNotification(): void {
+        $time = $this->timeFactory->getDateTime();
+
+        $notification = $this->notificationManager->createNotification();
+        $notification->setApp('core')
+            ->setDateTime($time)
+            ->setObject('repair', 'exposing_links')
+            ->setSubject('repair_exposing_links');
+
+        $users = array_keys($this->userToNotify);
+        foreach ($users as $user) {
+            $notification->setUser($user);
+            $this->notificationManager->notify($notification);
+        }
+    }
+
+    private function repair(IOutput $output): void {
+        $total = $this->getTotal();
+        $output->startProgress($total);
+
+        $shareCursor = $this->getShares();
+        while($data = $shareCursor->fetch()) {
+            $this->processShare($data);
+            $output->advance();
+        }
+        $output->finishProgress();
+        $shareCursor->closeCursor();
+
+        // Notifiy all admins
+        $adminGroup = $this->groupManager->get('admin');
+        $adminUsers = $adminGroup->getUsers();
+        foreach ($adminUsers as $user) {
+            $this->addToNotify($user->getUID());
+        }
+
+        $output->info('Sending notifications to admins and affected users');
+        $this->sendNotification();
+    }
+
+    public function run(IOutput $output): void {
+        if ($this->shouldRun()) {
+            $output->info('Removing potentially over exposing link shares');
+            $this->repair($output);
+            $output->info('Removed potentially over exposing link shares');
+        } else {
+            $output->info('No need to remove link shares.');
+        }
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -107,7 +107,7 @@ 
 
 		$subQuery = $this->connection->getQueryBuilder();
 		$subQuery->select('s1.id')
-			->from($subQuery->createFunction('(' . $subSubQuery->getSQL() . ')'), 's1')
+			->from($subQuery->createFunction('('.$subSubQuery->getSQL().')'), 's1')
 			->join(
 				's1', 'share', 's2',
 				$subQuery->expr()->eq('s1.parent', 's2.id')
@@ -121,7 +121,7 @@ 
 		$query = $this->connection->getQueryBuilder();
 		$query->select($query->func()->count('*', 'total'))
 			->from('share')
-			->where($query->expr()->in('id', $query->createFunction('(' . $subQuery->getSQL() . ')')));
+			->where($query->expr()->in('id', $query->createFunction('('.$subQuery->getSQL().')')));
 
 		$result = $query->execute();
 		$data = $result->fetch();
@@ -144,7 +144,7 @@ 
 
 		$query = $this->connection->getQueryBuilder();
 		$query->select('s1.id', 's1.uid_owner', 's1.uid_initiator')
-			->from($query->createFunction('(' . $subQuery->getSQL() . ')'), 's1')
+			->from($query->createFunction('('.$subQuery->getSQL().')'), 's1')
 			->join(
 				's1', 'share', 's2',
 				$query->expr()->eq('s1.parent', 's2.id')
@@ -168,7 +168,7 @@ 
 		$this->addToNotify($data['uid_owner']);
 		$this->addToNotify($data['uid_initiator']);
 
-		$this->deleteShare((int)$id);
+		$this->deleteShare((int) $id);
 	}
 
 	/**
@@ -206,7 +206,7 @@ 
 		$output->startProgress($total);
 
 		$shareCursor = $this->getShares();
-		while($data = $shareCursor->fetch()) {
+		while ($data = $shareCursor->fetch()) {
 			$this->processShare($data);
 			$output->advance();
 		}

lib/private/Repair.php

Indentation +174 added lines, -174 removed lines

@@ -64,178 +64,178 @@
 
 class Repair implements IOutput {
 
-	/** @var IRepairStep[] */
-	private $repairSteps;
-
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-
-	/** @var string */
-	private $currentStep;
-
-	/**
-	 * Creates a new repair step runner
-	 *
-	 * @param IRepairStep[] $repairSteps array of RepairStep instances
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(array $repairSteps, EventDispatcherInterface $dispatcher) {
-		$this->repairSteps = $repairSteps;
-		$this->dispatcher  = $dispatcher;
-	}
-
-	/**
-	 * Run a series of repair steps for common problems
-	 */
-	public function run() {
-		if (count($this->repairSteps) === 0) {
-			$this->emit('\OC\Repair', 'info', array('No repair steps available'));
-
-			return;
-		}
-		// run each repair step
-		foreach ($this->repairSteps as $step) {
-			$this->currentStep = $step->getName();
-			$this->emit('\OC\Repair', 'step', [$this->currentStep]);
-			$step->run($this);
-		}
-	}
-
-	/**
-	 * Add repair step
-	 *
-	 * @param IRepairStep|string $repairStep repair step
-	 * @throws \Exception
-	 */
-	public function addStep($repairStep) {
-		if (is_string($repairStep)) {
-			try {
-				$s = \OC::$server->query($repairStep);
-			} catch (QueryException $e) {
-				if (class_exists($repairStep)) {
-					$s = new $repairStep();
-				} else {
-					throw new \Exception("Repair step '$repairStep' is unknown");
-				}
-			}
-
-			if ($s instanceof IRepairStep) {
-				$this->repairSteps[] = $s;
-			} else {
-				throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
-			}
-		} else {
-			$this->repairSteps[] = $repairStep;
-		}
-	}
-
-	/**
-	 * Returns the default repair steps to be run on the
-	 * command line or after an upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getRepairSteps() {
-		return [
-			new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->getDatabaseConnection(), false),
-			new RepairMimeTypes(\OC::$server->getConfig()),
-			new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
-			new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
-			new RemoveRootShares(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager(), \OC::$server->getLazyRootFolder()),
-			new MoveUpdaterStepFile(\OC::$server->getConfig()),
-			new FixMountStorages(\OC::$server->getDatabaseConnection()),
-			new RepairInvalidPaths(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
-			new AddLogRotateJob(\OC::$server->getJobList()),
-			new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OC::$server->query(SCSSCacher::class), \OC::$server->query(JSCombiner::class)),
-			new ClearGeneratedAvatarCache(\OC::$server->getConfig(), \OC::$server->query(AvatarManager::class)),
-			new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
-			new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
-			new RepairPendingCronJobs(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
-			new SetVcardDatabaseUID(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getLogger()),
-			new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache'), \OC::$server->getLogger()),
-			new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
-			new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->getNotificationManager(), \OC::$server->query(ITimeFactory::class)),
-		];
-	}
-
-	/**
-	 * Returns expensive repair steps to be run on the
-	 * command line with a special option.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getExpensiveRepairSteps() {
-		return [
-			new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager())
-		];
-	}
-
-	/**
-	 * Returns the repair steps to be run before an
-	 * upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getBeforeUpgradeRepairSteps() {
-		$connection = \OC::$server->getDatabaseConnection();
-		$config     = \OC::$server->getConfig();
-		$steps      = [
-			new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connection, true),
-			new SqliteAutoincrement($connection),
-			new SaveAccountsTableData($connection, $config),
-			new DropAccountTermsTable($connection)
-		];
-
-		return $steps;
-	}
-
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments
-	 */
-	public function emit($scope, $method, array $arguments = []) {
-		if (!is_null($this->dispatcher)) {
-			$this->dispatcher->dispatch("$scope::$method",
-				new GenericEvent("$scope::$method", $arguments));
-		}
-	}
-
-	public function info($string) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'info', array($string));
-	}
-
-	/**
-	 * @param string $message
-	 */
-	public function warning($message) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'warning', [$message]);
-	}
-
-	/**
-	 * @param int $max
-	 */
-	public function startProgress($max = 0) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]);
-	}
-
-	/**
-	 * @param int $step
-	 * @param string $description
-	 */
-	public function advance($step = 1, $description = '') {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'advance', [$step, $description]);
-	}
-
-	/**
-	 * @param int $max
-	 */
-	public function finishProgress() {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'finishProgress', []);
-	}
+    /** @var IRepairStep[] */
+    private $repairSteps;
+
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+
+    /** @var string */
+    private $currentStep;
+
+    /**
+     * Creates a new repair step runner
+     *
+     * @param IRepairStep[] $repairSteps array of RepairStep instances
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(array $repairSteps, EventDispatcherInterface $dispatcher) {
+        $this->repairSteps = $repairSteps;
+        $this->dispatcher  = $dispatcher;
+    }
+
+    /**
+     * Run a series of repair steps for common problems
+     */
+    public function run() {
+        if (count($this->repairSteps) === 0) {
+            $this->emit('\OC\Repair', 'info', array('No repair steps available'));
+
+            return;
+        }
+        // run each repair step
+        foreach ($this->repairSteps as $step) {
+            $this->currentStep = $step->getName();
+            $this->emit('\OC\Repair', 'step', [$this->currentStep]);
+            $step->run($this);
+        }
+    }
+
+    /**
+     * Add repair step
+     *
+     * @param IRepairStep|string $repairStep repair step
+     * @throws \Exception
+     */
+    public function addStep($repairStep) {
+        if (is_string($repairStep)) {
+            try {
+                $s = \OC::$server->query($repairStep);
+            } catch (QueryException $e) {
+                if (class_exists($repairStep)) {
+                    $s = new $repairStep();
+                } else {
+                    throw new \Exception("Repair step '$repairStep' is unknown");
+                }
+            }
+
+            if ($s instanceof IRepairStep) {
+                $this->repairSteps[] = $s;
+            } else {
+                throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
+            }
+        } else {
+            $this->repairSteps[] = $repairStep;
+        }
+    }
+
+    /**
+     * Returns the default repair steps to be run on the
+     * command line or after an upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getRepairSteps() {
+        return [
+            new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->getDatabaseConnection(), false),
+            new RepairMimeTypes(\OC::$server->getConfig()),
+            new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
+            new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
+            new RemoveRootShares(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager(), \OC::$server->getLazyRootFolder()),
+            new MoveUpdaterStepFile(\OC::$server->getConfig()),
+            new FixMountStorages(\OC::$server->getDatabaseConnection()),
+            new RepairInvalidPaths(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
+            new AddLogRotateJob(\OC::$server->getJobList()),
+            new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OC::$server->query(SCSSCacher::class), \OC::$server->query(JSCombiner::class)),
+            new ClearGeneratedAvatarCache(\OC::$server->getConfig(), \OC::$server->query(AvatarManager::class)),
+            new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
+            new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
+            new RepairPendingCronJobs(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
+            new SetVcardDatabaseUID(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getLogger()),
+            new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache'), \OC::$server->getLogger()),
+            new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
+            new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->getNotificationManager(), \OC::$server->query(ITimeFactory::class)),
+        ];
+    }
+
+    /**
+     * Returns expensive repair steps to be run on the
+     * command line with a special option.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getExpensiveRepairSteps() {
+        return [
+            new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager())
+        ];
+    }
+
+    /**
+     * Returns the repair steps to be run before an
+     * upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getBeforeUpgradeRepairSteps() {
+        $connection = \OC::$server->getDatabaseConnection();
+        $config     = \OC::$server->getConfig();
+        $steps      = [
+            new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connection, true),
+            new SqliteAutoincrement($connection),
+            new SaveAccountsTableData($connection, $config),
+            new DropAccountTermsTable($connection)
+        ];
+
+        return $steps;
+    }
+
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments
+     */
+    public function emit($scope, $method, array $arguments = []) {
+        if (!is_null($this->dispatcher)) {
+            $this->dispatcher->dispatch("$scope::$method",
+                new GenericEvent("$scope::$method", $arguments));
+        }
+    }
+
+    public function info($string) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'info', array($string));
+    }
+
+    /**
+     * @param string $message
+     */
+    public function warning($message) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'warning', [$message]);
+    }
+
+    /**
+     * @param int $max
+     */
+    public function startProgress($max = 0) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]);
+    }
+
+    /**
+     * @param int $step
+     * @param string $description
+     */
+    public function advance($step = 1, $description = '') {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'advance', [$step, $description]);
+    }
+
+    /**
+     * @param int $max
+     */
+    public function finishProgress() {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'finishProgress', []);
+    }
 }

lib/private/DB/QueryBuilder/QueryBuilder.php

Indentation +1173 added lines, -1173 removed lines

@@ -47,1177 +47,1177 @@
 
 class QueryBuilder implements IQueryBuilder {
 
-	/** @var \OCP\IDBConnection */
-	private $connection;
-
-	/** @var SystemConfig */
-	private $systemConfig;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var \Doctrine\DBAL\Query\QueryBuilder */
-	private $queryBuilder;
-
-	/** @var QuoteHelper */
-	private $helper;
-
-	/** @var bool */
-	private $automaticTablePrefix = true;
-
-	/** @var string */
-	protected $lastInsertedTable;
-
-	/**
-	 * Initializes a new QueryBuilder.
-	 *
-	 * @param IDBConnection $connection
-	 * @param SystemConfig $systemConfig
-	 * @param ILogger $logger
-	 */
-	public function __construct(IDBConnection $connection, SystemConfig $systemConfig, ILogger $logger) {
-		$this->connection = $connection;
-		$this->systemConfig = $systemConfig;
-		$this->logger = $logger;
-		$this->queryBuilder = new \Doctrine\DBAL\Query\QueryBuilder($this->connection);
-		$this->helper = new QuoteHelper();
-	}
-
-	/**
-	 * Enable/disable automatic prefixing of table names with the oc_ prefix
-	 *
-	 * @param bool $enabled If set to true table names will be prefixed with the
-	 * owncloud database prefix automatically.
-	 * @since 8.2.0
-	 */
-	public function automaticTablePrefix($enabled) {
-		$this->automaticTablePrefix = (bool) $enabled;
-	}
-
-	/**
-	 * Gets an ExpressionBuilder used for object-oriented construction of query expressions.
-	 * This producer method is intended for convenient inline usage. Example:
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where($qb->expr()->eq('u.id', 1));
-	 * </code>
-	 *
-	 * For more complex expression construction, consider storing the expression
-	 * builder object in a local variable.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IExpressionBuilder
-	 */
-	public function expr() {
-		if ($this->connection instanceof OracleConnection) {
-			return new OCIExpressionBuilder($this->connection, $this);
-		} else if ($this->connection->getDatabasePlatform() instanceof PostgreSqlPlatform) {
-			return new PgSqlExpressionBuilder($this->connection, $this);
-		} else if ($this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
-			return new MySqlExpressionBuilder($this->connection, $this);
-		} else if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
-			return new SqliteExpressionBuilder($this->connection, $this);
-		} else {
-			return new ExpressionBuilder($this->connection, $this);
-		}
-	}
-
-	/**
-	 * Gets an FunctionBuilder used for object-oriented construction of query functions.
-	 * This producer method is intended for convenient inline usage. Example:
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where($qb->fun()->md5('u.id'));
-	 * </code>
-	 *
-	 * For more complex function construction, consider storing the function
-	 * builder object in a local variable.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IFunctionBuilder
-	 */
-	public function func() {
-		if ($this->connection instanceof OracleConnection) {
-			return new OCIFunctionBuilder($this->helper);
-		} else if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
-			return new SqliteFunctionBuilder($this->helper);
-		} else if ($this->connection->getDatabasePlatform() instanceof PostgreSqlPlatform) {
-			return new PgSqlFunctionBuilder($this->helper);
-		} else {
-			return new FunctionBuilder($this->helper);
-		}
-	}
-
-	/**
-	 * Gets the type of the currently built query.
-	 *
-	 * @return integer
-	 */
-	public function getType() {
-		return $this->queryBuilder->getType();
-	}
-
-	/**
-	 * Gets the associated DBAL Connection for this query builder.
-	 *
-	 * @return \OCP\IDBConnection
-	 */
-	public function getConnection() {
-		return $this->connection;
-	}
-
-	/**
-	 * Gets the state of this query builder instance.
-	 *
-	 * @return integer Either QueryBuilder::STATE_DIRTY or QueryBuilder::STATE_CLEAN.
-	 */
-	public function getState() {
-		return $this->queryBuilder->getState();
-	}
-
-	/**
-	 * Executes this query using the bound parameters and their types.
-	 *
-	 * Uses {@see Connection::executeQuery} for select statements and {@see Connection::executeUpdate}
-	 * for insert, update and delete statements.
-	 *
-	 * @return \Doctrine\DBAL\Driver\Statement|int
-	 */
-	public function execute() {
-		if ($this->systemConfig->getValue('log_query', false)) {
-			$params = [];
-			foreach ($this->getParameters() as $placeholder => $value) {
-				if (is_array($value)) {
-					$params[] = $placeholder . ' => (\'' . implode('\', \'', $value) . '\')';
-				} else {
-					$params[] = $placeholder . ' => \'' . $value . '\'';
-				}
-			}
-			if (empty($params)) {
-				$this->logger->debug('DB QueryBuilder: \'{query}\'', [
-					'query' => $this->getSQL(),
-					'app' => 'core',
-				]);
-			} else {
-				$this->logger->debug('DB QueryBuilder: \'{query}\' with parameters: {params}', [
-					'query' => $this->getSQL(),
-					'params' => implode(', ', $params),
-					'app' => 'core',
-				]);
-			}
-		}
-
-		return $this->queryBuilder->execute();
-	}
-
-	/**
-	 * Gets the complete SQL string formed by the current specifications of this QueryBuilder.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('User', 'u')
-	 *     echo $qb->getSQL(); // SELECT u FROM User u
-	 * </code>
-	 *
-	 * @return string The SQL query string.
-	 */
-	public function getSQL() {
-		return $this->queryBuilder->getSQL();
-	}
-
-	/**
-	 * Sets a query parameter for the query being constructed.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = :user_id')
-	 *         ->setParameter(':user_id', 1);
-	 * </code>
-	 *
-	 * @param string|integer $key The parameter position or name.
-	 * @param mixed $value The parameter value.
-	 * @param string|null|int $type One of the IQueryBuilder::PARAM_* constants.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function setParameter($key, $value, $type = null) {
-		$this->queryBuilder->setParameter($key, $value, $type);
-
-		return $this;
-	}
-
-	/**
-	 * Sets a collection of query parameters for the query being constructed.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = :user_id1 OR u.id = :user_id2')
-	 *         ->setParameters(array(
-	 *             ':user_id1' => 1,
-	 *             ':user_id2' => 2
-	 *         ));
-	 * </code>
-	 *
-	 * @param array $params The query parameters to set.
-	 * @param array $types The query parameters types to set.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function setParameters(array $params, array $types = array()) {
-		$this->queryBuilder->setParameters($params, $types);
-
-		return $this;
-	}
-
-	/**
-	 * Gets all defined query parameters for the query being constructed indexed by parameter index or name.
-	 *
-	 * @return array The currently defined query parameters indexed by parameter index or name.
-	 */
-	public function getParameters() {
-		return $this->queryBuilder->getParameters();
-	}
-
-	/**
-	 * Gets a (previously set) query parameter of the query being constructed.
-	 *
-	 * @param mixed $key The key (index or name) of the bound parameter.
-	 *
-	 * @return mixed The value of the bound parameter.
-	 */
-	public function getParameter($key) {
-		return $this->queryBuilder->getParameter($key);
-	}
-
-	/**
-	 * Gets all defined query parameter types for the query being constructed indexed by parameter index or name.
-	 *
-	 * @return array The currently defined query parameter types indexed by parameter index or name.
-	 */
-	public function getParameterTypes() {
-		return $this->queryBuilder->getParameterTypes();
-	}
-
-	/**
-	 * Gets a (previously set) query parameter type of the query being constructed.
-	 *
-	 * @param mixed $key The key (index or name) of the bound parameter type.
-	 *
-	 * @return mixed The value of the bound parameter type.
-	 */
-	public function getParameterType($key) {
-		return $this->queryBuilder->getParameterType($key);
-	}
-
-	/**
-	 * Sets the position of the first result to retrieve (the "offset").
-	 *
-	 * @param integer $firstResult The first result to return.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function setFirstResult($firstResult) {
-		$this->queryBuilder->setFirstResult($firstResult);
-
-		return $this;
-	}
-
-	/**
-	 * Gets the position of the first result the query object was set to retrieve (the "offset").
-	 * Returns NULL if {@link setFirstResult} was not applied to this QueryBuilder.
-	 *
-	 * @return integer The position of the first result.
-	 */
-	public function getFirstResult() {
-		return $this->queryBuilder->getFirstResult();
-	}
-
-	/**
-	 * Sets the maximum number of results to retrieve (the "limit").
-	 *
-	 * NOTE: Setting max results to "0" will cause mixed behaviour. While most
-	 * of the databases will just return an empty result set, Oracle will return
-	 * all entries.
-	 *
-	 * @param integer $maxResults The maximum number of results to retrieve.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function setMaxResults($maxResults) {
-		$this->queryBuilder->setMaxResults($maxResults);
-
-		return $this;
-	}
-
-	/**
-	 * Gets the maximum number of results the query object was set to retrieve (the "limit").
-	 * Returns NULL if {@link setMaxResults} was not applied to this query builder.
-	 *
-	 * @return integer The maximum number of results.
-	 */
-	public function getMaxResults() {
-		return $this->queryBuilder->getMaxResults();
-	}
-
-	/**
-	 * Specifies an item that is to be returned in the query result.
-	 * Replaces any previously specified selections, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.id', 'p.id')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
-	 * </code>
-	 *
-	 * @param mixed ...$selects The selection expressions.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function select(...$selects) {
-		if (count($selects) === 1 && is_array($selects[0])) {
-			$selects = $selects[0];
-		}
-
-		$this->queryBuilder->select(
-			$this->helper->quoteColumnNames($selects)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies an item that is to be returned with a different name in the query result.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->selectAlias('u.id', 'user_id')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
-	 * </code>
-	 *
-	 * @param mixed $select The selection expressions.
-	 * @param string $alias The column alias used in the constructed query.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function selectAlias($select, $alias) {
-
-		$this->queryBuilder->addSelect(
-			$this->helper->quoteColumnName($select) . ' AS ' . $this->helper->quoteColumnName($alias)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies an item that is to be returned uniquely in the query result.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->selectDistinct('type')
-	 *         ->from('users');
-	 * </code>
-	 *
-	 * @param mixed $select The selection expressions.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function selectDistinct($select) {
-
-		$this->queryBuilder->addSelect(
-			'DISTINCT ' . $this->helper->quoteColumnName($select)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds an item that is to be returned in the query result.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.id')
-	 *         ->addSelect('p.id')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'u.id = p.user_id');
-	 * </code>
-	 *
-	 * @param mixed ...$selects The selection expression.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function addSelect(...$selects) {
-		if (count($selects) === 1 && is_array($selects[0])) {
-			$selects = $selects[0];
-		}
-
-		$this->queryBuilder->addSelect(
-			$this->helper->quoteColumnNames($selects)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Turns the query being built into a bulk delete query that ranges over
-	 * a certain table.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->delete('users', 'u')
-	 *         ->where('u.id = :user_id');
-	 *         ->setParameter(':user_id', 1);
-	 * </code>
-	 *
-	 * @param string $delete The table whose rows are subject to the deletion.
-	 * @param string $alias The table alias used in the constructed query.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function delete($delete = null, $alias = null) {
-		$this->queryBuilder->delete(
-			$this->getTableName($delete),
-			$alias
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Turns the query being built into a bulk update query that ranges over
-	 * a certain table
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->update('users', 'u')
-	 *         ->set('u.password', md5('password'))
-	 *         ->where('u.id = ?');
-	 * </code>
-	 *
-	 * @param string $update The table whose rows are subject to the update.
-	 * @param string $alias The table alias used in the constructed query.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function update($update = null, $alias = null) {
-		$this->queryBuilder->update(
-			$this->getTableName($update),
-			$alias
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Turns the query being built into an insert query that inserts into
-	 * a certain table
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->insert('users')
-	 *         ->values(
-	 *             array(
-	 *                 'name' => '?',
-	 *                 'password' => '?'
-	 *             )
-	 *         );
-	 * </code>
-	 *
-	 * @param string $insert The table into which the rows should be inserted.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function insert($insert = null) {
-		$this->queryBuilder->insert(
-			$this->getTableName($insert)
-		);
-
-		$this->lastInsertedTable = $insert;
-
-		return $this;
-	}
-
-	/**
-	 * Creates and adds a query root corresponding to the table identified by the
-	 * given alias, forming a cartesian product with any existing query roots.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.id')
-	 *         ->from('users', 'u')
-	 * </code>
-	 *
-	 * @param string $from The table.
-	 * @param string|null $alias The alias of the table.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function from($from, $alias = null) {
-		$this->queryBuilder->from(
-			$this->getTableName($from),
-			$this->quoteAlias($alias)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Creates and adds a join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->join('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string $condition The condition for the join.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function join($fromAlias, $join, $alias, $condition = null) {
-		$this->queryBuilder->join(
-			$this->quoteAlias($fromAlias),
-			$this->getTableName($join),
-			$this->quoteAlias($alias),
-			$condition
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Creates and adds a join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->innerJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string $condition The condition for the join.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function innerJoin($fromAlias, $join, $alias, $condition = null) {
-		$this->queryBuilder->innerJoin(
-			$this->quoteAlias($fromAlias),
-			$this->getTableName($join),
-			$this->quoteAlias($alias),
-			$condition
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Creates and adds a left join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string $condition The condition for the join.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function leftJoin($fromAlias, $join, $alias, $condition = null) {
-		$this->queryBuilder->leftJoin(
-			$this->quoteAlias($fromAlias),
-			$this->getTableName($join),
-			$this->quoteAlias($alias),
-			$condition
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Creates and adds a right join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->rightJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string $condition The condition for the join.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function rightJoin($fromAlias, $join, $alias, $condition = null) {
-		$this->queryBuilder->rightJoin(
-			$this->quoteAlias($fromAlias),
-			$this->getTableName($join),
-			$this->quoteAlias($alias),
-			$condition
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Sets a new value for a column in a bulk update query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->update('users', 'u')
-	 *         ->set('u.password', md5('password'))
-	 *         ->where('u.id = ?');
-	 * </code>
-	 *
-	 * @param string $key The column to set.
-	 * @param string $value The value, expression, placeholder, etc.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function set($key, $value) {
-		$this->queryBuilder->set(
-			$this->helper->quoteColumnName($key),
-			$this->helper->quoteColumnName($value)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies one or more restrictions to the query result.
-	 * Replaces any previously specified restrictions, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = ?');
-	 *
-	 *     // You can optionally programatically build and/or expressions
-	 *     $qb = $conn->getQueryBuilder();
-	 *
-	 *     $or = $qb->expr()->orx();
-	 *     $or->add($qb->expr()->eq('u.id', 1));
-	 *     $or->add($qb->expr()->eq('u.id', 2));
-	 *
-	 *     $qb->update('users', 'u')
-	 *         ->set('u.password', md5('password'))
-	 *         ->where($or);
-	 * </code>
-	 *
-	 * @param mixed ...$predicates The restriction predicates.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function where(...$predicates) {
-		call_user_func_array(
-			[$this->queryBuilder, 'where'],
-			$predicates
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds one or more restrictions to the query results, forming a logical
-	 * conjunction with any previously specified restrictions.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where('u.username LIKE ?')
-	 *         ->andWhere('u.is_active = 1');
-	 * </code>
-	 *
-	 * @param mixed ...$where The query restrictions.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 *
-	 * @see where()
-	 */
-	public function andWhere(...$where) {
-		call_user_func_array(
-			[$this->queryBuilder, 'andWhere'],
-			$where
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds one or more restrictions to the query results, forming a logical
-	 * disjunction with any previously specified restrictions.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = 1')
-	 *         ->orWhere('u.id = 2');
-	 * </code>
-	 *
-	 * @param mixed ...$where The WHERE statement.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 *
-	 * @see where()
-	 */
-	public function orWhere(...$where) {
-		call_user_func_array(
-			[$this->queryBuilder, 'orWhere'],
-			$where
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies a grouping over the results of the query.
-	 * Replaces any previously specified groupings, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->groupBy('u.id');
-	 * </code>
-	 *
-	 * @param mixed ...$groupBys The grouping expression.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function groupBy(...$groupBys) {
-		if (count($groupBys) === 1 && is_array($groupBys[0])) {
-			$groupBys = $groupBys[0];
-		}
-
-		call_user_func_array(
-			[$this->queryBuilder, 'groupBy'],
-			$this->helper->quoteColumnNames($groupBys)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a grouping expression to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->groupBy('u.lastLogin');
-	 *         ->addGroupBy('u.createdAt')
-	 * </code>
-	 *
-	 * @param mixed ...$groupBy The grouping expression.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function addGroupBy(...$groupBys) {
-		if (count($groupBys) === 1 && is_array($groupBys[0])) {
-			$$groupBys = $groupBys[0];
-		}
-
-		call_user_func_array(
-			[$this->queryBuilder, 'addGroupBy'],
-			$this->helper->quoteColumnNames($groupBys)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Sets a value for a column in an insert query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->insert('users')
-	 *         ->values(
-	 *             array(
-	 *                 'name' => '?'
-	 *             )
-	 *         )
-	 *         ->setValue('password', '?');
-	 * </code>
-	 *
-	 * @param string $column The column into which the value should be inserted.
-	 * @param string $value The value that should be inserted into the column.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function setValue($column, $value) {
-		$this->queryBuilder->setValue(
-			$this->helper->quoteColumnName($column),
-			$value
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies values for an insert query indexed by column names.
-	 * Replaces any previous values, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->insert('users')
-	 *         ->values(
-	 *             array(
-	 *                 'name' => '?',
-	 *                 'password' => '?'
-	 *             )
-	 *         );
-	 * </code>
-	 *
-	 * @param array $values The values to specify for the insert query indexed by column names.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function values(array $values) {
-		$quotedValues = [];
-		foreach ($values as $key => $value) {
-			$quotedValues[$this->helper->quoteColumnName($key)] = $value;
-		}
-
-		$this->queryBuilder->values($quotedValues);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies a restriction over the groups of the query.
-	 * Replaces any previous having restrictions, if any.
-	 *
-	 * @param mixed ...$having The restriction over the groups.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function having(...$having) {
-		call_user_func_array(
-			[$this->queryBuilder, 'having'],
-			$having
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a restriction over the groups of the query, forming a logical
-	 * conjunction with any existing having restrictions.
-	 *
-	 * @param mixed ...$having The restriction to append.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function andHaving(...$having) {
-		call_user_func_array(
-			[$this->queryBuilder, 'andHaving'],
-			$having
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a restriction over the groups of the query, forming a logical
-	 * disjunction with any existing having restrictions.
-	 *
-	 * @param mixed ...$having The restriction to add.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function orHaving(...$having) {
-		call_user_func_array(
-			[$this->queryBuilder, 'orHaving'],
-			$having
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies an ordering for the query results.
-	 * Replaces any previously specified orderings, if any.
-	 *
-	 * @param string $sort The ordering expression.
-	 * @param string $order The ordering direction.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function orderBy($sort, $order = null) {
-		$this->queryBuilder->orderBy(
-			$this->helper->quoteColumnName($sort),
-			$order
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds an ordering to the query results.
-	 *
-	 * @param string $sort The ordering expression.
-	 * @param string $order The ordering direction.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function addOrderBy($sort, $order = null) {
-		$this->queryBuilder->addOrderBy(
-			$this->helper->quoteColumnName($sort),
-			$order
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Gets a query part by its name.
-	 *
-	 * @param string $queryPartName
-	 *
-	 * @return mixed
-	 */
-	public function getQueryPart($queryPartName) {
-		return $this->queryBuilder->getQueryPart($queryPartName);
-	}
-
-	/**
-	 * Gets all query parts.
-	 *
-	 * @return array
-	 */
-	public function getQueryParts() {
-		return $this->queryBuilder->getQueryParts();
-	}
-
-	/**
-	 * Resets SQL parts.
-	 *
-	 * @param array|null $queryPartNames
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function resetQueryParts($queryPartNames = null) {
-		$this->queryBuilder->resetQueryParts($queryPartNames);
-
-		return $this;
-	}
-
-	/**
-	 * Resets a single SQL part.
-	 *
-	 * @param string $queryPartName
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function resetQueryPart($queryPartName) {
-		$this->queryBuilder->resetQueryPart($queryPartName);
-
-		return $this;
-	}
-
-	/**
-	 * Creates a new named parameter and bind the value $value to it.
-	 *
-	 * This method provides a shortcut for PDOStatement::bindValue
-	 * when using prepared statements.
-	 *
-	 * The parameter $value specifies the value that you want to bind. If
-	 * $placeholder is not provided bindValue() will automatically create a
-	 * placeholder for you. An automatic placeholder will be of the name
-	 * ':dcValue1', ':dcValue2' etc.
-	 *
-	 * For more information see {@link http://php.net/pdostatement-bindparam}
-	 *
-	 * Example:
-	 * <code>
-	 * $value = 2;
-	 * $q->eq( 'id', $q->bindValue( $value ) );
-	 * $stmt = $q->executeQuery(); // executed with 'id = 2'
-	 * </code>
-	 *
-	 * @license New BSD License
-	 * @link http://www.zetacomponents.org
-	 *
-	 * @param mixed $value
-	 * @param mixed $type
-	 * @param string $placeHolder The name to bind with. The string must start with a colon ':'.
-	 *
-	 * @return IParameter the placeholder name used.
-	 */
-	public function createNamedParameter($value, $type = IQueryBuilder::PARAM_STR, $placeHolder = null) {
-		return new Parameter($this->queryBuilder->createNamedParameter($value, $type, $placeHolder));
-	}
-
-	/**
-	 * Creates a new positional parameter and bind the given value to it.
-	 *
-	 * Attention: If you are using positional parameters with the query builder you have
-	 * to be very careful to bind all parameters in the order they appear in the SQL
-	 * statement , otherwise they get bound in the wrong order which can lead to serious
-	 * bugs in your code.
-	 *
-	 * Example:
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select('u.*')
-	 *     ->from('users', 'u')
-	 *     ->where('u.username = ' . $qb->createPositionalParameter('Foo', IQueryBuilder::PARAM_STR))
-	 *     ->orWhere('u.username = ' . $qb->createPositionalParameter('Bar', IQueryBuilder::PARAM_STR))
-	 * </code>
-	 *
-	 * @param mixed $value
-	 * @param integer $type
-	 *
-	 * @return IParameter
-	 */
-	public function createPositionalParameter($value, $type = IQueryBuilder::PARAM_STR) {
-		return new Parameter($this->queryBuilder->createPositionalParameter($value, $type));
-	}
-
-	/**
-	 * Creates a new parameter
-	 *
-	 * Example:
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select('u.*')
-	 *     ->from('users', 'u')
-	 *     ->where('u.username = ' . $qb->createParameter('name'))
-	 *     ->setParameter('name', 'Bar', IQueryBuilder::PARAM_STR))
-	 * </code>
-	 *
-	 * @param string $name
-	 *
-	 * @return IParameter
-	 */
-	public function createParameter($name) {
-		return new Parameter(':' . $name);
-	}
-
-	/**
-	 * Creates a new function
-	 *
-	 * Attention: Column names inside the call have to be quoted before hand
-	 *
-	 * Example:
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select($qb->createFunction('COUNT(*)'))
-	 *     ->from('users', 'u')
-	 *  echo $qb->getSQL(); // SELECT COUNT(*) FROM `users` u
-	 * </code>
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select($qb->createFunction('COUNT(`column`)'))
-	 *     ->from('users', 'u')
-	 *  echo $qb->getSQL(); // SELECT COUNT(`column`) FROM `users` u
-	 * </code>
-	 *
-	 * @param string $call
-	 *
-	 * @return IQueryFunction
-	 */
-	public function createFunction($call) {
-		return new QueryFunction($call);
-	}
-
-	/**
-	 * Used to get the id of the last inserted element
-	 * @return int
-	 * @throws \BadMethodCallException When being called before an insert query has been run.
-	 */
-	public function getLastInsertId() {
-		if ($this->getType() === \Doctrine\DBAL\Query\QueryBuilder::INSERT && $this->lastInsertedTable) {
-			// lastInsertId() needs the prefix but no quotes
-			$table = $this->prefixTableName($this->lastInsertedTable);
-			return (int) $this->connection->lastInsertId($table);
-		}
-
-		throw new \BadMethodCallException('Invalid call to getLastInsertId without using insert() before.');
-	}
-
-	/**
-	 * Returns the table name quoted and with database prefix as needed by the implementation
-	 *
-	 * @param string $table
-	 * @return string
-	 */
-	public function getTableName($table) {
-		if ($table instanceof IQueryFunction) {
-			return (string) $table;
-		}
-
-		$table = $this->prefixTableName($table);
-		return $this->helper->quoteColumnName($table);
-	}
-
-	/**
-	 * Returns the table name with database prefix as needed by the implementation
-	 *
-	 * @param string $table
-	 * @return string
-	 */
-	protected function prefixTableName($table) {
-		if ($this->automaticTablePrefix === false || strpos($table, '*PREFIX*') === 0) {
-			return $table;
-		}
-
-		return '*PREFIX*' . $table;
-	}
-
-	/**
-	 * Returns the column name quoted and with table alias prefix as needed by the implementation
-	 *
-	 * @param string $column
-	 * @param string $tableAlias
-	 * @return string
-	 */
-	public function getColumnName($column, $tableAlias = '') {
-		if ($tableAlias !== '') {
-			$tableAlias .= '.';
-		}
-
-		return $this->helper->quoteColumnName($tableAlias . $column);
-	}
-
-	/**
-	 * Returns the column name quoted and with table alias prefix as needed by the implementation
-	 *
-	 * @param string $alias
-	 * @return string
-	 */
-	public function quoteAlias($alias) {
-		if ($alias === '' || $alias === null) {
-			return $alias;
-		}
-
-		return $this->helper->quoteColumnName($alias);
-	}
+    /** @var \OCP\IDBConnection */
+    private $connection;
+
+    /** @var SystemConfig */
+    private $systemConfig;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var \Doctrine\DBAL\Query\QueryBuilder */
+    private $queryBuilder;
+
+    /** @var QuoteHelper */
+    private $helper;
+
+    /** @var bool */
+    private $automaticTablePrefix = true;
+
+    /** @var string */
+    protected $lastInsertedTable;
+
+    /**
+     * Initializes a new QueryBuilder.
+     *
+     * @param IDBConnection $connection
+     * @param SystemConfig $systemConfig
+     * @param ILogger $logger
+     */
+    public function __construct(IDBConnection $connection, SystemConfig $systemConfig, ILogger $logger) {
+        $this->connection = $connection;
+        $this->systemConfig = $systemConfig;
+        $this->logger = $logger;
+        $this->queryBuilder = new \Doctrine\DBAL\Query\QueryBuilder($this->connection);
+        $this->helper = new QuoteHelper();
+    }
+
+    /**
+     * Enable/disable automatic prefixing of table names with the oc_ prefix
+     *
+     * @param bool $enabled If set to true table names will be prefixed with the
+     * owncloud database prefix automatically.
+     * @since 8.2.0
+     */
+    public function automaticTablePrefix($enabled) {
+        $this->automaticTablePrefix = (bool) $enabled;
+    }
+
+    /**
+     * Gets an ExpressionBuilder used for object-oriented construction of query expressions.
+     * This producer method is intended for convenient inline usage. Example:
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where($qb->expr()->eq('u.id', 1));
+     * </code>
+     *
+     * For more complex expression construction, consider storing the expression
+     * builder object in a local variable.
+     *
+     * @return \OCP\DB\QueryBuilder\IExpressionBuilder
+     */
+    public function expr() {
+        if ($this->connection instanceof OracleConnection) {
+            return new OCIExpressionBuilder($this->connection, $this);
+        } else if ($this->connection->getDatabasePlatform() instanceof PostgreSqlPlatform) {
+            return new PgSqlExpressionBuilder($this->connection, $this);
+        } else if ($this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
+            return new MySqlExpressionBuilder($this->connection, $this);
+        } else if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
+            return new SqliteExpressionBuilder($this->connection, $this);
+        } else {
+            return new ExpressionBuilder($this->connection, $this);
+        }
+    }
+
+    /**
+     * Gets an FunctionBuilder used for object-oriented construction of query functions.
+     * This producer method is intended for convenient inline usage. Example:
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where($qb->fun()->md5('u.id'));
+     * </code>
+     *
+     * For more complex function construction, consider storing the function
+     * builder object in a local variable.
+     *
+     * @return \OCP\DB\QueryBuilder\IFunctionBuilder
+     */
+    public function func() {
+        if ($this->connection instanceof OracleConnection) {
+            return new OCIFunctionBuilder($this->helper);
+        } else if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
+            return new SqliteFunctionBuilder($this->helper);
+        } else if ($this->connection->getDatabasePlatform() instanceof PostgreSqlPlatform) {
+            return new PgSqlFunctionBuilder($this->helper);
+        } else {
+            return new FunctionBuilder($this->helper);
+        }
+    }
+
+    /**
+     * Gets the type of the currently built query.
+     *
+     * @return integer
+     */
+    public function getType() {
+        return $this->queryBuilder->getType();
+    }
+
+    /**
+     * Gets the associated DBAL Connection for this query builder.
+     *
+     * @return \OCP\IDBConnection
+     */
+    public function getConnection() {
+        return $this->connection;
+    }
+
+    /**
+     * Gets the state of this query builder instance.
+     *
+     * @return integer Either QueryBuilder::STATE_DIRTY or QueryBuilder::STATE_CLEAN.
+     */
+    public function getState() {
+        return $this->queryBuilder->getState();
+    }
+
+    /**
+     * Executes this query using the bound parameters and their types.
+     *
+     * Uses {@see Connection::executeQuery} for select statements and {@see Connection::executeUpdate}
+     * for insert, update and delete statements.
+     *
+     * @return \Doctrine\DBAL\Driver\Statement|int
+     */
+    public function execute() {
+        if ($this->systemConfig->getValue('log_query', false)) {
+            $params = [];
+            foreach ($this->getParameters() as $placeholder => $value) {
+                if (is_array($value)) {
+                    $params[] = $placeholder . ' => (\'' . implode('\', \'', $value) . '\')';
+                } else {
+                    $params[] = $placeholder . ' => \'' . $value . '\'';
+                }
+            }
+            if (empty($params)) {
+                $this->logger->debug('DB QueryBuilder: \'{query}\'', [
+                    'query' => $this->getSQL(),
+                    'app' => 'core',
+                ]);
+            } else {
+                $this->logger->debug('DB QueryBuilder: \'{query}\' with parameters: {params}', [
+                    'query' => $this->getSQL(),
+                    'params' => implode(', ', $params),
+                    'app' => 'core',
+                ]);
+            }
+        }
+
+        return $this->queryBuilder->execute();
+    }
+
+    /**
+     * Gets the complete SQL string formed by the current specifications of this QueryBuilder.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('User', 'u')
+     *     echo $qb->getSQL(); // SELECT u FROM User u
+     * </code>
+     *
+     * @return string The SQL query string.
+     */
+    public function getSQL() {
+        return $this->queryBuilder->getSQL();
+    }
+
+    /**
+     * Sets a query parameter for the query being constructed.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where('u.id = :user_id')
+     *         ->setParameter(':user_id', 1);
+     * </code>
+     *
+     * @param string|integer $key The parameter position or name.
+     * @param mixed $value The parameter value.
+     * @param string|null|int $type One of the IQueryBuilder::PARAM_* constants.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function setParameter($key, $value, $type = null) {
+        $this->queryBuilder->setParameter($key, $value, $type);
+
+        return $this;
+    }
+
+    /**
+     * Sets a collection of query parameters for the query being constructed.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where('u.id = :user_id1 OR u.id = :user_id2')
+     *         ->setParameters(array(
+     *             ':user_id1' => 1,
+     *             ':user_id2' => 2
+     *         ));
+     * </code>
+     *
+     * @param array $params The query parameters to set.
+     * @param array $types The query parameters types to set.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function setParameters(array $params, array $types = array()) {
+        $this->queryBuilder->setParameters($params, $types);
+
+        return $this;
+    }
+
+    /**
+     * Gets all defined query parameters for the query being constructed indexed by parameter index or name.
+     *
+     * @return array The currently defined query parameters indexed by parameter index or name.
+     */
+    public function getParameters() {
+        return $this->queryBuilder->getParameters();
+    }
+
+    /**
+     * Gets a (previously set) query parameter of the query being constructed.
+     *
+     * @param mixed $key The key (index or name) of the bound parameter.
+     *
+     * @return mixed The value of the bound parameter.
+     */
+    public function getParameter($key) {
+        return $this->queryBuilder->getParameter($key);
+    }
+
+    /**
+     * Gets all defined query parameter types for the query being constructed indexed by parameter index or name.
+     *
+     * @return array The currently defined query parameter types indexed by parameter index or name.
+     */
+    public function getParameterTypes() {
+        return $this->queryBuilder->getParameterTypes();
+    }
+
+    /**
+     * Gets a (previously set) query parameter type of the query being constructed.
+     *
+     * @param mixed $key The key (index or name) of the bound parameter type.
+     *
+     * @return mixed The value of the bound parameter type.
+     */
+    public function getParameterType($key) {
+        return $this->queryBuilder->getParameterType($key);
+    }
+
+    /**
+     * Sets the position of the first result to retrieve (the "offset").
+     *
+     * @param integer $firstResult The first result to return.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function setFirstResult($firstResult) {
+        $this->queryBuilder->setFirstResult($firstResult);
+
+        return $this;
+    }
+
+    /**
+     * Gets the position of the first result the query object was set to retrieve (the "offset").
+     * Returns NULL if {@link setFirstResult} was not applied to this QueryBuilder.
+     *
+     * @return integer The position of the first result.
+     */
+    public function getFirstResult() {
+        return $this->queryBuilder->getFirstResult();
+    }
+
+    /**
+     * Sets the maximum number of results to retrieve (the "limit").
+     *
+     * NOTE: Setting max results to "0" will cause mixed behaviour. While most
+     * of the databases will just return an empty result set, Oracle will return
+     * all entries.
+     *
+     * @param integer $maxResults The maximum number of results to retrieve.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function setMaxResults($maxResults) {
+        $this->queryBuilder->setMaxResults($maxResults);
+
+        return $this;
+    }
+
+    /**
+     * Gets the maximum number of results the query object was set to retrieve (the "limit").
+     * Returns NULL if {@link setMaxResults} was not applied to this query builder.
+     *
+     * @return integer The maximum number of results.
+     */
+    public function getMaxResults() {
+        return $this->queryBuilder->getMaxResults();
+    }
+
+    /**
+     * Specifies an item that is to be returned in the query result.
+     * Replaces any previously specified selections, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.id', 'p.id')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
+     * </code>
+     *
+     * @param mixed ...$selects The selection expressions.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function select(...$selects) {
+        if (count($selects) === 1 && is_array($selects[0])) {
+            $selects = $selects[0];
+        }
+
+        $this->queryBuilder->select(
+            $this->helper->quoteColumnNames($selects)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Specifies an item that is to be returned with a different name in the query result.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->selectAlias('u.id', 'user_id')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
+     * </code>
+     *
+     * @param mixed $select The selection expressions.
+     * @param string $alias The column alias used in the constructed query.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function selectAlias($select, $alias) {
+
+        $this->queryBuilder->addSelect(
+            $this->helper->quoteColumnName($select) . ' AS ' . $this->helper->quoteColumnName($alias)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Specifies an item that is to be returned uniquely in the query result.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->selectDistinct('type')
+     *         ->from('users');
+     * </code>
+     *
+     * @param mixed $select The selection expressions.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function selectDistinct($select) {
+
+        $this->queryBuilder->addSelect(
+            'DISTINCT ' . $this->helper->quoteColumnName($select)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds an item that is to be returned in the query result.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.id')
+     *         ->addSelect('p.id')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'u.id = p.user_id');
+     * </code>
+     *
+     * @param mixed ...$selects The selection expression.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function addSelect(...$selects) {
+        if (count($selects) === 1 && is_array($selects[0])) {
+            $selects = $selects[0];
+        }
+
+        $this->queryBuilder->addSelect(
+            $this->helper->quoteColumnNames($selects)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Turns the query being built into a bulk delete query that ranges over
+     * a certain table.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->delete('users', 'u')
+     *         ->where('u.id = :user_id');
+     *         ->setParameter(':user_id', 1);
+     * </code>
+     *
+     * @param string $delete The table whose rows are subject to the deletion.
+     * @param string $alias The table alias used in the constructed query.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function delete($delete = null, $alias = null) {
+        $this->queryBuilder->delete(
+            $this->getTableName($delete),
+            $alias
+        );
+
+        return $this;
+    }
+
+    /**
+     * Turns the query being built into a bulk update query that ranges over
+     * a certain table
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->update('users', 'u')
+     *         ->set('u.password', md5('password'))
+     *         ->where('u.id = ?');
+     * </code>
+     *
+     * @param string $update The table whose rows are subject to the update.
+     * @param string $alias The table alias used in the constructed query.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function update($update = null, $alias = null) {
+        $this->queryBuilder->update(
+            $this->getTableName($update),
+            $alias
+        );
+
+        return $this;
+    }
+
+    /**
+     * Turns the query being built into an insert query that inserts into
+     * a certain table
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->insert('users')
+     *         ->values(
+     *             array(
+     *                 'name' => '?',
+     *                 'password' => '?'
+     *             )
+     *         );
+     * </code>
+     *
+     * @param string $insert The table into which the rows should be inserted.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function insert($insert = null) {
+        $this->queryBuilder->insert(
+            $this->getTableName($insert)
+        );
+
+        $this->lastInsertedTable = $insert;
+
+        return $this;
+    }
+
+    /**
+     * Creates and adds a query root corresponding to the table identified by the
+     * given alias, forming a cartesian product with any existing query roots.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.id')
+     *         ->from('users', 'u')
+     * </code>
+     *
+     * @param string $from The table.
+     * @param string|null $alias The alias of the table.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function from($from, $alias = null) {
+        $this->queryBuilder->from(
+            $this->getTableName($from),
+            $this->quoteAlias($alias)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Creates and adds a join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->join('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string $condition The condition for the join.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function join($fromAlias, $join, $alias, $condition = null) {
+        $this->queryBuilder->join(
+            $this->quoteAlias($fromAlias),
+            $this->getTableName($join),
+            $this->quoteAlias($alias),
+            $condition
+        );
+
+        return $this;
+    }
+
+    /**
+     * Creates and adds a join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->innerJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string $condition The condition for the join.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function innerJoin($fromAlias, $join, $alias, $condition = null) {
+        $this->queryBuilder->innerJoin(
+            $this->quoteAlias($fromAlias),
+            $this->getTableName($join),
+            $this->quoteAlias($alias),
+            $condition
+        );
+
+        return $this;
+    }
+
+    /**
+     * Creates and adds a left join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string $condition The condition for the join.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function leftJoin($fromAlias, $join, $alias, $condition = null) {
+        $this->queryBuilder->leftJoin(
+            $this->quoteAlias($fromAlias),
+            $this->getTableName($join),
+            $this->quoteAlias($alias),
+            $condition
+        );
+
+        return $this;
+    }
+
+    /**
+     * Creates and adds a right join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->rightJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string $condition The condition for the join.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function rightJoin($fromAlias, $join, $alias, $condition = null) {
+        $this->queryBuilder->rightJoin(
+            $this->quoteAlias($fromAlias),
+            $this->getTableName($join),
+            $this->quoteAlias($alias),
+            $condition
+        );
+
+        return $this;
+    }
+
+    /**
+     * Sets a new value for a column in a bulk update query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->update('users', 'u')
+     *         ->set('u.password', md5('password'))
+     *         ->where('u.id = ?');
+     * </code>
+     *
+     * @param string $key The column to set.
+     * @param string $value The value, expression, placeholder, etc.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function set($key, $value) {
+        $this->queryBuilder->set(
+            $this->helper->quoteColumnName($key),
+            $this->helper->quoteColumnName($value)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Specifies one or more restrictions to the query result.
+     * Replaces any previously specified restrictions, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->where('u.id = ?');
+     *
+     *     // You can optionally programatically build and/or expressions
+     *     $qb = $conn->getQueryBuilder();
+     *
+     *     $or = $qb->expr()->orx();
+     *     $or->add($qb->expr()->eq('u.id', 1));
+     *     $or->add($qb->expr()->eq('u.id', 2));
+     *
+     *     $qb->update('users', 'u')
+     *         ->set('u.password', md5('password'))
+     *         ->where($or);
+     * </code>
+     *
+     * @param mixed ...$predicates The restriction predicates.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function where(...$predicates) {
+        call_user_func_array(
+            [$this->queryBuilder, 'where'],
+            $predicates
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds one or more restrictions to the query results, forming a logical
+     * conjunction with any previously specified restrictions.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where('u.username LIKE ?')
+     *         ->andWhere('u.is_active = 1');
+     * </code>
+     *
+     * @param mixed ...$where The query restrictions.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     *
+     * @see where()
+     */
+    public function andWhere(...$where) {
+        call_user_func_array(
+            [$this->queryBuilder, 'andWhere'],
+            $where
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds one or more restrictions to the query results, forming a logical
+     * disjunction with any previously specified restrictions.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->where('u.id = 1')
+     *         ->orWhere('u.id = 2');
+     * </code>
+     *
+     * @param mixed ...$where The WHERE statement.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     *
+     * @see where()
+     */
+    public function orWhere(...$where) {
+        call_user_func_array(
+            [$this->queryBuilder, 'orWhere'],
+            $where
+        );
+
+        return $this;
+    }
+
+    /**
+     * Specifies a grouping over the results of the query.
+     * Replaces any previously specified groupings, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->groupBy('u.id');
+     * </code>
+     *
+     * @param mixed ...$groupBys The grouping expression.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function groupBy(...$groupBys) {
+        if (count($groupBys) === 1 && is_array($groupBys[0])) {
+            $groupBys = $groupBys[0];
+        }
+
+        call_user_func_array(
+            [$this->queryBuilder, 'groupBy'],
+            $this->helper->quoteColumnNames($groupBys)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds a grouping expression to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->groupBy('u.lastLogin');
+     *         ->addGroupBy('u.createdAt')
+     * </code>
+     *
+     * @param mixed ...$groupBy The grouping expression.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function addGroupBy(...$groupBys) {
+        if (count($groupBys) === 1 && is_array($groupBys[0])) {
+            $$groupBys = $groupBys[0];
+        }
+
+        call_user_func_array(
+            [$this->queryBuilder, 'addGroupBy'],
+            $this->helper->quoteColumnNames($groupBys)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Sets a value for a column in an insert query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->insert('users')
+     *         ->values(
+     *             array(
+     *                 'name' => '?'
+     *             )
+     *         )
+     *         ->setValue('password', '?');
+     * </code>
+     *
+     * @param string $column The column into which the value should be inserted.
+     * @param string $value The value that should be inserted into the column.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function setValue($column, $value) {
+        $this->queryBuilder->setValue(
+            $this->helper->quoteColumnName($column),
+            $value
+        );
+
+        return $this;
+    }
+
+    /**
+     * Specifies values for an insert query indexed by column names.
+     * Replaces any previous values, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->insert('users')
+     *         ->values(
+     *             array(
+     *                 'name' => '?',
+     *                 'password' => '?'
+     *             )
+     *         );
+     * </code>
+     *
+     * @param array $values The values to specify for the insert query indexed by column names.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function values(array $values) {
+        $quotedValues = [];
+        foreach ($values as $key => $value) {
+            $quotedValues[$this->helper->quoteColumnName($key)] = $value;
+        }
+
+        $this->queryBuilder->values($quotedValues);
+
+        return $this;
+    }
+
+    /**
+     * Specifies a restriction over the groups of the query.
+     * Replaces any previous having restrictions, if any.
+     *
+     * @param mixed ...$having The restriction over the groups.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function having(...$having) {
+        call_user_func_array(
+            [$this->queryBuilder, 'having'],
+            $having
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds a restriction over the groups of the query, forming a logical
+     * conjunction with any existing having restrictions.
+     *
+     * @param mixed ...$having The restriction to append.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function andHaving(...$having) {
+        call_user_func_array(
+            [$this->queryBuilder, 'andHaving'],
+            $having
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds a restriction over the groups of the query, forming a logical
+     * disjunction with any existing having restrictions.
+     *
+     * @param mixed ...$having The restriction to add.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function orHaving(...$having) {
+        call_user_func_array(
+            [$this->queryBuilder, 'orHaving'],
+            $having
+        );
+
+        return $this;
+    }
+
+    /**
+     * Specifies an ordering for the query results.
+     * Replaces any previously specified orderings, if any.
+     *
+     * @param string $sort The ordering expression.
+     * @param string $order The ordering direction.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function orderBy($sort, $order = null) {
+        $this->queryBuilder->orderBy(
+            $this->helper->quoteColumnName($sort),
+            $order
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds an ordering to the query results.
+     *
+     * @param string $sort The ordering expression.
+     * @param string $order The ordering direction.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function addOrderBy($sort, $order = null) {
+        $this->queryBuilder->addOrderBy(
+            $this->helper->quoteColumnName($sort),
+            $order
+        );
+
+        return $this;
+    }
+
+    /**
+     * Gets a query part by its name.
+     *
+     * @param string $queryPartName
+     *
+     * @return mixed
+     */
+    public function getQueryPart($queryPartName) {
+        return $this->queryBuilder->getQueryPart($queryPartName);
+    }
+
+    /**
+     * Gets all query parts.
+     *
+     * @return array
+     */
+    public function getQueryParts() {
+        return $this->queryBuilder->getQueryParts();
+    }
+
+    /**
+     * Resets SQL parts.
+     *
+     * @param array|null $queryPartNames
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function resetQueryParts($queryPartNames = null) {
+        $this->queryBuilder->resetQueryParts($queryPartNames);
+
+        return $this;
+    }
+
+    /**
+     * Resets a single SQL part.
+     *
+     * @param string $queryPartName
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function resetQueryPart($queryPartName) {
+        $this->queryBuilder->resetQueryPart($queryPartName);
+
+        return $this;
+    }
+
+    /**
+     * Creates a new named parameter and bind the value $value to it.
+     *
+     * This method provides a shortcut for PDOStatement::bindValue
+     * when using prepared statements.
+     *
+     * The parameter $value specifies the value that you want to bind. If
+     * $placeholder is not provided bindValue() will automatically create a
+     * placeholder for you. An automatic placeholder will be of the name
+     * ':dcValue1', ':dcValue2' etc.
+     *
+     * For more information see {@link http://php.net/pdostatement-bindparam}
+     *
+     * Example:
+     * <code>
+     * $value = 2;
+     * $q->eq( 'id', $q->bindValue( $value ) );
+     * $stmt = $q->executeQuery(); // executed with 'id = 2'
+     * </code>
+     *
+     * @license New BSD License
+     * @link http://www.zetacomponents.org
+     *
+     * @param mixed $value
+     * @param mixed $type
+     * @param string $placeHolder The name to bind with. The string must start with a colon ':'.
+     *
+     * @return IParameter the placeholder name used.
+     */
+    public function createNamedParameter($value, $type = IQueryBuilder::PARAM_STR, $placeHolder = null) {
+        return new Parameter($this->queryBuilder->createNamedParameter($value, $type, $placeHolder));
+    }
+
+    /**
+     * Creates a new positional parameter and bind the given value to it.
+     *
+     * Attention: If you are using positional parameters with the query builder you have
+     * to be very careful to bind all parameters in the order they appear in the SQL
+     * statement , otherwise they get bound in the wrong order which can lead to serious
+     * bugs in your code.
+     *
+     * Example:
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select('u.*')
+     *     ->from('users', 'u')
+     *     ->where('u.username = ' . $qb->createPositionalParameter('Foo', IQueryBuilder::PARAM_STR))
+     *     ->orWhere('u.username = ' . $qb->createPositionalParameter('Bar', IQueryBuilder::PARAM_STR))
+     * </code>
+     *
+     * @param mixed $value
+     * @param integer $type
+     *
+     * @return IParameter
+     */
+    public function createPositionalParameter($value, $type = IQueryBuilder::PARAM_STR) {
+        return new Parameter($this->queryBuilder->createPositionalParameter($value, $type));
+    }
+
+    /**
+     * Creates a new parameter
+     *
+     * Example:
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select('u.*')
+     *     ->from('users', 'u')
+     *     ->where('u.username = ' . $qb->createParameter('name'))
+     *     ->setParameter('name', 'Bar', IQueryBuilder::PARAM_STR))
+     * </code>
+     *
+     * @param string $name
+     *
+     * @return IParameter
+     */
+    public function createParameter($name) {
+        return new Parameter(':' . $name);
+    }
+
+    /**
+     * Creates a new function
+     *
+     * Attention: Column names inside the call have to be quoted before hand
+     *
+     * Example:
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select($qb->createFunction('COUNT(*)'))
+     *     ->from('users', 'u')
+     *  echo $qb->getSQL(); // SELECT COUNT(*) FROM `users` u
+     * </code>
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select($qb->createFunction('COUNT(`column`)'))
+     *     ->from('users', 'u')
+     *  echo $qb->getSQL(); // SELECT COUNT(`column`) FROM `users` u
+     * </code>
+     *
+     * @param string $call
+     *
+     * @return IQueryFunction
+     */
+    public function createFunction($call) {
+        return new QueryFunction($call);
+    }
+
+    /**
+     * Used to get the id of the last inserted element
+     * @return int
+     * @throws \BadMethodCallException When being called before an insert query has been run.
+     */
+    public function getLastInsertId() {
+        if ($this->getType() === \Doctrine\DBAL\Query\QueryBuilder::INSERT && $this->lastInsertedTable) {
+            // lastInsertId() needs the prefix but no quotes
+            $table = $this->prefixTableName($this->lastInsertedTable);
+            return (int) $this->connection->lastInsertId($table);
+        }
+
+        throw new \BadMethodCallException('Invalid call to getLastInsertId without using insert() before.');
+    }
+
+    /**
+     * Returns the table name quoted and with database prefix as needed by the implementation
+     *
+     * @param string $table
+     * @return string
+     */
+    public function getTableName($table) {
+        if ($table instanceof IQueryFunction) {
+            return (string) $table;
+        }
+
+        $table = $this->prefixTableName($table);
+        return $this->helper->quoteColumnName($table);
+    }
+
+    /**
+     * Returns the table name with database prefix as needed by the implementation
+     *
+     * @param string $table
+     * @return string
+     */
+    protected function prefixTableName($table) {
+        if ($this->automaticTablePrefix === false || strpos($table, '*PREFIX*') === 0) {
+            return $table;
+        }
+
+        return '*PREFIX*' . $table;
+    }
+
+    /**
+     * Returns the column name quoted and with table alias prefix as needed by the implementation
+     *
+     * @param string $column
+     * @param string $tableAlias
+     * @return string
+     */
+    public function getColumnName($column, $tableAlias = '') {
+        if ($tableAlias !== '') {
+            $tableAlias .= '.';
+        }
+
+        return $this->helper->quoteColumnName($tableAlias . $column);
+    }
+
+    /**
+     * Returns the column name quoted and with table alias prefix as needed by the implementation
+     *
+     * @param string $alias
+     * @return string
+     */
+    public function quoteAlias($alias) {
+        if ($alias === '' || $alias === null) {
+            return $alias;
+        }
+
+        return $this->helper->quoteColumnName($alias);
+    }
 }