Code cleanup.

Signed-off-by: Ole Ostergaard <[email protected]>

Author: oole

lib/private/DB/Adapter.php

@@ -130,13 +130,13 @@ public function insertIfNotExist($table, $input, array $compare = null) {
 	/*
 	 * @suppress SqlInjectionChecker
 	 */
-	public function insertIgnoreConflict($table, $input) : int {
+	public function insertIgnoreConflict(string $table,array $values) : int {
 		try {
 			$builder = $this->conn->getQueryBuilder();
-			$builder->insert($table);
-			foreach($input as $key => $value) {
-				$builder->setValue($key, $builder->createNamedParameter($value));
-			}
+			$builder->insert($table)->values($values);
+//			foreach($values as $key => $value) {
+//				$builder->setValue($key, $builder->createNamedParameter($value));
+//			}
 			return $builder->execute();
 		} catch(UniqueConstraintViolationException $e) {
 			return 0;

lib/private/DB/AdapterPgSql.php

@@ -39,15 +39,13 @@ public function fixupStatement($statement) {
 	/*
 	 * @suppress SqlInjectionChecker
 	 */
-	public function insertIgnoreConflict($table, $input) : int {
+	public function insertIgnoreConflict(string $table,array $values) : int {
 		$builder = $this->conn->getQueryBuilder();
-		$builder->insert($table)
-			->values($input);
-		foreach($input as $key => $value) {
-			$builder->setValue($key, $builder->createNamedParameter($value));
-		}
+		$builder->insert($table)->values($values);
+//		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());
 	}
 }

lib/private/DB/Connection.php

@@ -257,8 +257,8 @@ public function insertIfNotExist($table, $input, array $compare = null) {
 		return $this->adapter->insertIfNotExist($table, $input, $compare);
 	}
 
-	public function insertIgnoreConflict($table, $input) : int {
-		return $this->adapter->insertIgnoreConflict($table, $input);
+	public function insertIgnoreConflict(string $table, array $values) : int {
+		return $this->adapter->insertIgnoreConflict($table, $values);
 	}
 
 	private function getType($value) {

lib/private/Lock/DBLockingProvider.php

@@ -131,10 +131,13 @@ 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
+		]);
 	}
 
 	/**

lib/public/IDBConnection.php

@@ -128,11 +128,11 @@ public function insertIfNotExist($table, $input, array $compare = null);
 	 * Implementation is not fully finished and should not be used!
 	 *
 	 * @param string $table The table name (will replace *PREFIX* with the actual prefix)
-	 * @param array $input data that should be inserted into the table  (column name => value)
+	 * @param array $values data that should be inserted into the table  (column name => value)
 	 * @return int number of inserted rows
-	 * @since 17.0.0
+	 * @since 16.0.0
 	 */
-	public function insertIgnoreConflict($table, $input) : int;
+	public function insertIgnoreConflict(string $table,array $values) : int;
 
 	/**
 	 * Insert or update a row value