Code cleanup.

Signed-off-by: Ole Ostergaard <[email protected]>
nextcloud · Feb 26, 2019 · 1b1231c · 1b1231c
1 parent 6247745
commit 1b1231c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/lib/private/DB/Adapter.php b/lib/private/DB/Adapter.php
@@ -130,11 +130,11 @@ public function insertIfNotExist($table, $input, array $compare = null) {
 	/*
 	 * @suppress SqlInjectionChecker
 	 */
-	public function insertIgnoreConflict($table, $input) : int {
+	public function insertIgnoreConflict($table, $values) : int {
 		try {
 			$builder = $this->conn->getQueryBuilder();
 			$builder->insert($table);
-			foreach($input as $key => $value) {
+			foreach($values as $key => $value) {
 				$builder->setValue($key, $builder->createNamedParameter($value));
 			}
 			return $builder->execute();

diff --git a/lib/private/DB/AdapterPgSql.php b/lib/private/DB/AdapterPgSql.php
@@ -39,15 +39,13 @@ public function fixupStatement($statement) {
 	/*
 	 * @suppress SqlInjectionChecker
 	 */
-	public function insertIgnoreConflict($table, $input) : int {
+	public function insertIgnoreConflict($table, $values) : int {
 		$builder = $this->conn->getQueryBuilder();
-		$builder->insert($table)
-			->values($input);
-		foreach($input as $key => $value) {
+		$builder->insert($table);
+		foreach($values as $key => $value) {
 			$builder->setValue($key, $builder->createNamedParameter($value));
 		}
 		$queryString = $builder->getSQL() . ' ON CONFLICT DO NOTHING';
-		$inserts = array_values($input);
-		return $this->conn->executeUpdate($queryString, $inserts);
+		return $this->conn->executeUpdate($queryString, $builder->getParameters(), $builder->getParameterTypes());
 	}
 }
diff --git a/lib/private/Lock/DBLockingProvider.php b/lib/private/Lock/DBLockingProvider.php
@@ -131,10 +131,12 @@ public function __construct(
 	 * @param int $lock
 	 * @return int number of inserted rows
 	 */
-
 	protected function initLockField(string $path, int $lock = 0): int {
 		$expire = $this->getExpireTime();
-		return $this->connection->insertIgnoreConflict('file_locks', ['key' => $path, 'lock' => $lock, 'ttl' => $expire]);
+		return $this->connection->insertIgnoreConflict('file_locks', [
+			'key' => $path,
+			'lock' => $lock,
+			'ttl' => $expire]);
 	}
 
 	/**