Use query builder instead of OC_DB in user_ldap

Signed-off-by: Joas Schilling <coding@schilljs.com>

1 files changed, 21 insertions, 27 deletions

diff --git a/apps/user_ldap/lib/Helper.php b/apps/user_ldap/lib/Helper.php
index 86712534f40..2cd8b528d0b 100644
--- a/apps/user_ldap/lib/Helper.php
+++ b/apps/user_ldap/lib/Helper.php
@@ -35,23 +35,25 @@
 namespace OCA\User_LDAP;
 
 use OC\Cache\CappedMemoryCache;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IConfig;
+use OCP\IDBConnection;
 
 class Helper {
 
 	/** @var IConfig */
 	private $config;
 
+	/** @var IDBConnection */
+	private $connection;
+
 	/** @var CappedMemoryCache */
 	protected $sanitizeDnCache;
 
-	/**
-	 * Helper constructor.
-	 *
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
+	public function __construct(IConfig $config,
+								IDBConnection $connection) {
 		$this->config = $config;
+		$this->connection = $connection;
 		$this->sanitizeDnCache = new CappedMemoryCache(10000);
 	}
 
@@ -160,30 +162,22 @@ class Helper {
 			return false;
 		}
 
-		$saveOtherConfigurations = '';
-		if (empty($prefix)) {
-			$saveOtherConfigurations = 'AND `configkey` NOT LIKE \'s%\'';
-		}
+		$query = $this->connection->getQueryBuilder();
+		$query->delete('appconfig')
+			->where($query->expr()->eq('appid', $query->createNamedParameter('user_ldap')))
+			->andWhere($query->expr()->notIn('configkey', $query->createNamedParameter([
+				'enabled',
+				'installed_version',
+				'types',
+				'bgjUpdateGroupsLastRun',
+			]), IQueryBuilder::PARAM_STR_ARRAY));
 
-		$query = \OC_DB::prepare('
-			DELETE
-			FROM `*PREFIX*appconfig`
-			WHERE `configkey` LIKE ?
-				' . $saveOtherConfigurations . '
-				AND `appid` = \'user_ldap\'
-				AND `configkey` NOT IN (\'enabled\', \'installed_version\', \'types\', \'bgjUpdateGroupsLastRun\')
-		');
-		$delRows = $query->execute([$prefix . '%']);
-
-		if ($delRows === null) {
-			return false;
-		}
-
-		if ($delRows === 0) {
-			return false;
+		if (empty($prefix)) {
+			$query->andWhere($query->expr()->notLike('configkey', $query->createNamedParameter('s%')));
 		}
 
-		return true;
+		$deletedRows = $query->execute();
+		return $deletedRows !== 0;
 	}
 
 	/**