nextcloud / server

lib/public/DB/QueryBuilder/IFunctionBuilder.php

Indentation +113 added lines, -113 removed lines

@@ -31,128 +31,128 @@
  * @since 12.0.0
  */
 interface IFunctionBuilder {
-	/**
-	 * Calculates the MD5 hash of a given input
-	 *
-	 * @param mixed $input The input to be hashed
-	 *
-	 * @return IQueryFunction
-	 * @since 12.0.0
-	 */
-	public function md5($input);
+    /**
+     * Calculates the MD5 hash of a given input
+     *
+     * @param mixed $input The input to be hashed
+     *
+     * @return IQueryFunction
+     * @since 12.0.0
+     */
+    public function md5($input);
 
-	/**
-	 * Combines two input strings
-	 *
-	 * @param mixed $x The first input string
-	 * @param mixed $y The seccond input string
-	 *
-	 * @return IQueryFunction
-	 * @since 12.0.0
-	 */
-	public function concat($x, $y);
+    /**
+     * Combines two input strings
+     *
+     * @param mixed $x The first input string
+     * @param mixed $y The seccond input string
+     *
+     * @return IQueryFunction
+     * @since 12.0.0
+     */
+    public function concat($x, $y);
 
-	/**
-	 * Takes a substring from the input string
-	 *
-	 * @param mixed $input The input string
-	 * @param mixed $start The start of the substring, note that counting starts at 1
-	 * @param mixed $length The length of the substring
-	 *
-	 * @return IQueryFunction
-	 * @since 12.0.0
-	 */
-	public function substring($input, $start, $length = null);
+    /**
+     * Takes a substring from the input string
+     *
+     * @param mixed $input The input string
+     * @param mixed $start The start of the substring, note that counting starts at 1
+     * @param mixed $length The length of the substring
+     *
+     * @return IQueryFunction
+     * @since 12.0.0
+     */
+    public function substring($input, $start, $length = null);
 
-	/**
-	 * Takes the sum of all rows in a column
-	 *
-	 * @param mixed $field the column to sum
-	 *
-	 * @return IQueryFunction
-	 * @since 12.0.0
-	 */
-	public function sum($field);
+    /**
+     * Takes the sum of all rows in a column
+     *
+     * @param mixed $field the column to sum
+     *
+     * @return IQueryFunction
+     * @since 12.0.0
+     */
+    public function sum($field);
 
-	/**
-	 * Transforms a string field or value to lower case
-	 *
-	 * @param mixed $field
-	 * @return IQueryFunction
-	 * @since 14.0.0
-	 */
-	public function lower($field);
+    /**
+     * Transforms a string field or value to lower case
+     *
+     * @param mixed $field
+     * @return IQueryFunction
+     * @since 14.0.0
+     */
+    public function lower($field);
 
-	/**
-	 * @param mixed $x The first input field or number
-	 * @param mixed $y The second input field or number
-	 * @return IQueryFunction
-	 * @since 14.0.0
-	 */
-	public function add($x, $y);
+    /**
+     * @param mixed $x The first input field or number
+     * @param mixed $y The second input field or number
+     * @return IQueryFunction
+     * @since 14.0.0
+     */
+    public function add($x, $y);
 
-	/**
-	 * @param mixed $x The first input field or number
-	 * @param mixed $y The second input field or number
-	 * @return IQueryFunction
-	 * @since 14.0.0
-	 */
-	public function subtract($x, $y);
+    /**
+     * @param mixed $x The first input field or number
+     * @param mixed $y The second input field or number
+     * @return IQueryFunction
+     * @since 14.0.0
+     */
+    public function subtract($x, $y);
 
-	/**
-	 * @param mixed $count The input to be counted
-	 * @param string $alias Alias for the counter
-	 *
-	 * @return IQueryFunction
-	 * @since 14.0.0
-	 */
-	public function count($count = '', $alias = '');
+    /**
+     * @param mixed $count The input to be counted
+     * @param string $alias Alias for the counter
+     *
+     * @return IQueryFunction
+     * @since 14.0.0
+     */
+    public function count($count = '', $alias = '');
 
-	/**
-	 * Takes the maximum of all rows in a column
-	 *
-	 * If you want to get the maximum value of multiple columns in the same row, use `greatest` instead
-	 *
-	 * @param mixed $field the column to maximum
-	 *
-	 * @return IQueryFunction
-	 * @since 18.0.0
-	 */
-	public function max($field);
+    /**
+     * Takes the maximum of all rows in a column
+     *
+     * If you want to get the maximum value of multiple columns in the same row, use `greatest` instead
+     *
+     * @param mixed $field the column to maximum
+     *
+     * @return IQueryFunction
+     * @since 18.0.0
+     */
+    public function max($field);
 
-	/**
-	 * Takes the minimum of all rows in a column
-	 *
-	 * If you want to get the minimum value of multiple columns in the same row, use `least` instead
-	 *
-	 * @param mixed $field the column to minimum
-	 *
-	 * @return IQueryFunction
-	 * @since 18.0.0
-	 */
-	public function min($field);
+    /**
+     * Takes the minimum of all rows in a column
+     *
+     * If you want to get the minimum value of multiple columns in the same row, use `least` instead
+     *
+     * @param mixed $field the column to minimum
+     *
+     * @return IQueryFunction
+     * @since 18.0.0
+     */
+    public function min($field);
 
-	/**
-	 * Takes the maximum of multiple values
-	 *
-	 * If you want to get the maximum value of all rows in a column, use `max` instead
-	 *
-	 * @param string|ILiteral|IParameter|IQueryFunction $x
-	 * @param string|ILiteral|IParameter|IQueryFunction $y
-	 * @return IQueryFunction
-	 * @since 18.0.0
-	 */
-	public function greatest($x, $y);
+    /**
+     * Takes the maximum of multiple values
+     *
+     * If you want to get the maximum value of all rows in a column, use `max` instead
+     *
+     * @param string|ILiteral|IParameter|IQueryFunction $x
+     * @param string|ILiteral|IParameter|IQueryFunction $y
+     * @return IQueryFunction
+     * @since 18.0.0
+     */
+    public function greatest($x, $y);
 
-	/**
-	 * Takes the minimum of multiple values
-	 *
-	 * If you want to get the minimum value of all rows in a column, use `min` instead
-	 *
-	 * @param string|ILiteral|IParameter|IQueryFunction $x
-	 * @param string|ILiteral|IParameter|IQueryFunction $y
-	 * @return IQueryFunction
-	 * @since 18.0.0
-	 */
-	public function least($x, $y);
+    /**
+     * Takes the minimum of multiple values
+     *
+     * If you want to get the minimum value of all rows in a column, use `min` instead
+     *
+     * @param string|ILiteral|IParameter|IQueryFunction $x
+     * @param string|ILiteral|IParameter|IQueryFunction $y
+     * @return IQueryFunction
+     * @since 18.0.0
+     */
+    public function least($x, $y);
 }

lib/private/Files/Cache/Propagator.php

Indentation +165 added lines, -165 removed lines

@@ -33,169 +33,169 @@
  * Propagate etags and mtimes within the storage
  */
 class Propagator implements IPropagator {
-	private $inBatch = false;
-
-	private $batch = [];
-
-	/**
-	 * @var \OC\Files\Storage\Storage
-	 */
-	protected $storage;
-
-	/**
-	 * @var IDBConnection
-	 */
-	private $connection;
-
-	/**
-	 * @var array
-	 */
-	private $ignore = [];
-
-	public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection, array $ignore = []) {
-		$this->storage = $storage;
-		$this->connection = $connection;
-		$this->ignore = $ignore;
-	}
-
-
-	/**
-	 * @param string $internalPath
-	 * @param int $time
-	 * @param int $sizeDifference number of bytes the file has grown
-	 */
-	public function propagateChange($internalPath, $time, $sizeDifference = 0) {
-		// Do not propogate changes in ignored paths
-		foreach ($this->ignore as $ignore) {
-			if (strpos($internalPath, $ignore) === 0) {
-				return;
-			}
-		}
-
-		$storageId = (int)$this->storage->getStorageCache()->getNumericId();
-
-		$parents = $this->getParents($internalPath);
-
-		if ($this->inBatch) {
-			foreach ($parents as $parent) {
-				$this->addToBatch($parent, $time, $sizeDifference);
-			}
-			return;
-		}
-
-		$parentHashes = array_map('md5', $parents);
-		$etag = uniqid(); // since we give all folders the same etag we don't ask the storage for the etag
-
-		$builder = $this->connection->getQueryBuilder();
-		$hashParams = array_map(function ($hash) use ($builder) {
-			return $builder->expr()->literal($hash);
-		}, $parentHashes);
-
-		$builder->update('filecache')
-			->set('mtime', $builder->func()->greatest('mtime', $builder->createNamedParameter((int)$time, IQueryBuilder::PARAM_INT)))
-			->set('etag', $builder->createNamedParameter($etag, IQueryBuilder::PARAM_STR))
-			->where($builder->expr()->eq('storage', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
-			->andWhere($builder->expr()->in('path_hash', $hashParams));
-
-		$builder->execute();
-
-		if ($sizeDifference !== 0) {
-			// we need to do size separably so we can ignore entries with uncalculated size
-			$builder = $this->connection->getQueryBuilder();
-			$builder->update('filecache')
-				->set('size', $builder->func()->greatest(
-					$builder->func()->add('size', $builder->createNamedParameter($sizeDifference)),
-					$builder->createNamedParameter(-1, IQueryBuilder::PARAM_INT)
-				))
-				->where($builder->expr()->eq('storage', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
-				->andWhere($builder->expr()->in('path_hash', $hashParams))
-				->andWhere($builder->expr()->gt('size', $builder->expr()->literal(-1, IQueryBuilder::PARAM_INT)));
-
-			$builder->execute();
-		}
-	}
-
-	protected function getParents($path) {
-		$parts = explode('/', $path);
-		$parent = '';
-		$parents = [];
-		foreach ($parts as $part) {
-			$parents[] = $parent;
-			$parent = trim($parent . '/' . $part, '/');
-		}
-		return $parents;
-	}
-
-	/**
-	 * Mark the beginning of a propagation batch
-	 *
-	 * Note that not all cache setups support propagation in which case this will be a noop
-	 *
-	 * Batching for cache setups that do support it has to be explicit since the cache state is not fully consistent
-	 * before the batch is committed.
-	 */
-	public function beginBatch() {
-		$this->inBatch = true;
-	}
-
-	private function addToBatch($internalPath, $time, $sizeDifference) {
-		if (!isset($this->batch[$internalPath])) {
-			$this->batch[$internalPath] = [
-				'hash' => md5($internalPath),
-				'time' => $time,
-				'size' => $sizeDifference
-			];
-		} else {
-			$this->batch[$internalPath]['size'] += $sizeDifference;
-			if ($time > $this->batch[$internalPath]['time']) {
-				$this->batch[$internalPath]['time'] = $time;
-			}
-		}
-	}
-
-	/**
-	 * Commit the active propagation batch
-	 */
-	public function commitBatch() {
-		if (!$this->inBatch) {
-			throw new \BadMethodCallException('Not in batch');
-		}
-		$this->inBatch = false;
-
-		$this->connection->beginTransaction();
-
-		$query = $this->connection->getQueryBuilder();
-		$storageId = (int)$this->storage->getStorageCache()->getNumericId();
-
-		$query->update('filecache')
-			->set('mtime', $query->func()->greatest('mtime', $query->createParameter('time')))
-			->set('etag', $query->expr()->literal(uniqid()))
-			->where($query->expr()->eq('storage', $query->expr()->literal($storageId, IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('path_hash', $query->createParameter('hash')));
-
-		$sizeQuery = $this->connection->getQueryBuilder();
-		$sizeQuery->update('filecache')
-			->set('size', $sizeQuery->func()->add('size', $sizeQuery->createParameter('size')))
-			->where($query->expr()->eq('storage', $query->expr()->literal($storageId, IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('path_hash', $query->createParameter('hash')))
-			->andWhere($sizeQuery->expr()->gt('size', $sizeQuery->expr()->literal(-1, IQueryBuilder::PARAM_INT)));
-
-		foreach ($this->batch as $item) {
-			$query->setParameter('time', $item['time'], IQueryBuilder::PARAM_INT);
-			$query->setParameter('hash', $item['hash']);
-
-			$query->execute();
-
-			if ($item['size']) {
-				$sizeQuery->setParameter('size', $item['size'], IQueryBuilder::PARAM_INT);
-				$sizeQuery->setParameter('hash', $item['hash']);
-
-				$sizeQuery->execute();
-			}
-		}
-
-		$this->batch = [];
-
-		$this->connection->commit();
-	}
+    private $inBatch = false;
+
+    private $batch = [];
+
+    /**
+     * @var \OC\Files\Storage\Storage
+     */
+    protected $storage;
+
+    /**
+     * @var IDBConnection
+     */
+    private $connection;
+
+    /**
+     * @var array
+     */
+    private $ignore = [];
+
+    public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection, array $ignore = []) {
+        $this->storage = $storage;
+        $this->connection = $connection;
+        $this->ignore = $ignore;
+    }
+
+
+    /**
+     * @param string $internalPath
+     * @param int $time
+     * @param int $sizeDifference number of bytes the file has grown
+     */
+    public function propagateChange($internalPath, $time, $sizeDifference = 0) {
+        // Do not propogate changes in ignored paths
+        foreach ($this->ignore as $ignore) {
+            if (strpos($internalPath, $ignore) === 0) {
+                return;
+            }
+        }
+
+        $storageId = (int)$this->storage->getStorageCache()->getNumericId();
+
+        $parents = $this->getParents($internalPath);
+
+        if ($this->inBatch) {
+            foreach ($parents as $parent) {
+                $this->addToBatch($parent, $time, $sizeDifference);
+            }
+            return;
+        }
+
+        $parentHashes = array_map('md5', $parents);
+        $etag = uniqid(); // since we give all folders the same etag we don't ask the storage for the etag
+
+        $builder = $this->connection->getQueryBuilder();
+        $hashParams = array_map(function ($hash) use ($builder) {
+            return $builder->expr()->literal($hash);
+        }, $parentHashes);
+
+        $builder->update('filecache')
+            ->set('mtime', $builder->func()->greatest('mtime', $builder->createNamedParameter((int)$time, IQueryBuilder::PARAM_INT)))
+            ->set('etag', $builder->createNamedParameter($etag, IQueryBuilder::PARAM_STR))
+            ->where($builder->expr()->eq('storage', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
+            ->andWhere($builder->expr()->in('path_hash', $hashParams));
+
+        $builder->execute();
+
+        if ($sizeDifference !== 0) {
+            // we need to do size separably so we can ignore entries with uncalculated size
+            $builder = $this->connection->getQueryBuilder();
+            $builder->update('filecache')
+                ->set('size', $builder->func()->greatest(
+                    $builder->func()->add('size', $builder->createNamedParameter($sizeDifference)),
+                    $builder->createNamedParameter(-1, IQueryBuilder::PARAM_INT)
+                ))
+                ->where($builder->expr()->eq('storage', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
+                ->andWhere($builder->expr()->in('path_hash', $hashParams))
+                ->andWhere($builder->expr()->gt('size', $builder->expr()->literal(-1, IQueryBuilder::PARAM_INT)));
+
+            $builder->execute();
+        }
+    }
+
+    protected function getParents($path) {
+        $parts = explode('/', $path);
+        $parent = '';
+        $parents = [];
+        foreach ($parts as $part) {
+            $parents[] = $parent;
+            $parent = trim($parent . '/' . $part, '/');
+        }
+        return $parents;
+    }
+
+    /**
+     * Mark the beginning of a propagation batch
+     *
+     * Note that not all cache setups support propagation in which case this will be a noop
+     *
+     * Batching for cache setups that do support it has to be explicit since the cache state is not fully consistent
+     * before the batch is committed.
+     */
+    public function beginBatch() {
+        $this->inBatch = true;
+    }
+
+    private function addToBatch($internalPath, $time, $sizeDifference) {
+        if (!isset($this->batch[$internalPath])) {
+            $this->batch[$internalPath] = [
+                'hash' => md5($internalPath),
+                'time' => $time,
+                'size' => $sizeDifference
+            ];
+        } else {
+            $this->batch[$internalPath]['size'] += $sizeDifference;
+            if ($time > $this->batch[$internalPath]['time']) {
+                $this->batch[$internalPath]['time'] = $time;
+            }
+        }
+    }
+
+    /**
+     * Commit the active propagation batch
+     */
+    public function commitBatch() {
+        if (!$this->inBatch) {
+            throw new \BadMethodCallException('Not in batch');
+        }
+        $this->inBatch = false;
+
+        $this->connection->beginTransaction();
+
+        $query = $this->connection->getQueryBuilder();
+        $storageId = (int)$this->storage->getStorageCache()->getNumericId();
+
+        $query->update('filecache')
+            ->set('mtime', $query->func()->greatest('mtime', $query->createParameter('time')))
+            ->set('etag', $query->expr()->literal(uniqid()))
+            ->where($query->expr()->eq('storage', $query->expr()->literal($storageId, IQueryBuilder::PARAM_INT)))
+            ->andWhere($query->expr()->eq('path_hash', $query->createParameter('hash')));
+
+        $sizeQuery = $this->connection->getQueryBuilder();
+        $sizeQuery->update('filecache')
+            ->set('size', $sizeQuery->func()->add('size', $sizeQuery->createParameter('size')))
+            ->where($query->expr()->eq('storage', $query->expr()->literal($storageId, IQueryBuilder::PARAM_INT)))
+            ->andWhere($query->expr()->eq('path_hash', $query->createParameter('hash')))
+            ->andWhere($sizeQuery->expr()->gt('size', $sizeQuery->expr()->literal(-1, IQueryBuilder::PARAM_INT)));
+
+        foreach ($this->batch as $item) {
+            $query->setParameter('time', $item['time'], IQueryBuilder::PARAM_INT);
+            $query->setParameter('hash', $item['hash']);
+
+            $query->execute();
+
+            if ($item['size']) {
+                $sizeQuery->setParameter('size', $item['size'], IQueryBuilder::PARAM_INT);
+                $sizeQuery->setParameter('hash', $item['hash']);
+
+                $sizeQuery->execute();
+            }
+        }
+
+        $this->batch = [];
+
+        $this->connection->commit();
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -72,7 +72,7 @@ 
 			}
 		}
 
-		$storageId = (int)$this->storage->getStorageCache()->getNumericId();
+		$storageId = (int) $this->storage->getStorageCache()->getNumericId();
 
 		$parents = $this->getParents($internalPath);
 
@@ -87,12 +87,12 @@ 
 		$etag = uniqid(); // since we give all folders the same etag we don't ask the storage for the etag
 
 		$builder = $this->connection->getQueryBuilder();
-		$hashParams = array_map(function ($hash) use ($builder) {
+		$hashParams = array_map(function($hash) use ($builder) {
 			return $builder->expr()->literal($hash);
 		}, $parentHashes);
 
 		$builder->update('filecache')
-			->set('mtime', $builder->func()->greatest('mtime', $builder->createNamedParameter((int)$time, IQueryBuilder::PARAM_INT)))
+			->set('mtime', $builder->func()->greatest('mtime', $builder->createNamedParameter((int) $time, IQueryBuilder::PARAM_INT)))
 			->set('etag', $builder->createNamedParameter($etag, IQueryBuilder::PARAM_STR))
 			->where($builder->expr()->eq('storage', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
 			->andWhere($builder->expr()->in('path_hash', $hashParams));
@@ -121,7 +121,7 @@ 
 		$parents = [];
 		foreach ($parts as $part) {
 			$parents[] = $parent;
-			$parent = trim($parent . '/' . $part, '/');
+			$parent = trim($parent.'/'.$part, '/');
 		}
 		return $parents;
 	}
@@ -165,7 +165,7 @@ 
 		$this->connection->beginTransaction();
 
 		$query = $this->connection->getQueryBuilder();
-		$storageId = (int)$this->storage->getStorageCache()->getNumericId();
+		$storageId = (int) $this->storage->getStorageCache()->getNumericId();
 
 		$query->update('filecache')
 			->set('mtime', $query->func()->greatest('mtime', $query->createParameter('time')))

lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php

Indentation +75 added lines, -75 removed lines

@@ -32,79 +32,79 @@
 use OCP\DB\QueryBuilder\IQueryFunction;
 
 class FunctionBuilder implements IFunctionBuilder {
-	/** @var QuoteHelper */
-	protected $helper;
-
-	/**
-	 * ExpressionBuilder constructor.
-	 *
-	 * @param QuoteHelper $helper
-	 */
-	public function __construct(QuoteHelper $helper) {
-		$this->helper = $helper;
-	}
-
-	public function md5($input) {
-		return new QueryFunction('MD5(' . $this->helper->quoteColumnName($input) . ')');
-	}
-
-	public function concat($x, $y) {
-		return new QueryFunction('CONCAT(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
-	}
-
-	public function substring($input, $start, $length = null) {
-		if ($length) {
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ', ' . $this->helper->quoteColumnName($length) . ')');
-		} else {
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ')');
-		}
-	}
-
-	public function sum($field) {
-		return new QueryFunction('SUM(' . $this->helper->quoteColumnName($field) . ')');
-	}
-
-	public function lower($field) {
-		return new QueryFunction('LOWER(' . $this->helper->quoteColumnName($field) . ')');
-	}
-
-	public function add($x, $y) {
-		return new QueryFunction($this->helper->quoteColumnName($x) . ' + ' . $this->helper->quoteColumnName($y));
-	}
-
-	public function subtract($x, $y) {
-		return new QueryFunction($this->helper->quoteColumnName($x) . ' - ' . $this->helper->quoteColumnName($y));
-	}
-
-	public function count($count = '', $alias = '') {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
-		$quotedName = $count === '' ? '*' : $this->helper->quoteColumnName($count);
-		return new QueryFunction('COUNT(' . $quotedName . ')' . $alias);
-	}
-
-	public function max($field) {
-		return new QueryFunction('MAX(' . $this->helper->quoteColumnName($field) . ')');
-	}
-
-	public function min($field) {
-		return new QueryFunction('MIN(' . $this->helper->quoteColumnName($field) . ')');
-	}
-
-	/**
-	 * @param string|ILiteral|IParameter|IQueryFunction $x
-	 * @param string|ILiteral|IParameter|IQueryFunction $y
-	 * @return IQueryFunction
-	 */
-	public function greatest($x, $y) {
-		return new QueryFunction('GREATEST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
-	}
-
-	/**
-	 * @param string|ILiteral|IParameter|IQueryFunction $x
-	 * @param string|ILiteral|IParameter|IQueryFunction $y
-	 * @return IQueryFunction
-	 */
-	public function least($x, $y) {
-		return new QueryFunction('LEAST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
-	}
+    /** @var QuoteHelper */
+    protected $helper;
+
+    /**
+     * ExpressionBuilder constructor.
+     *
+     * @param QuoteHelper $helper
+     */
+    public function __construct(QuoteHelper $helper) {
+        $this->helper = $helper;
+    }
+
+    public function md5($input) {
+        return new QueryFunction('MD5(' . $this->helper->quoteColumnName($input) . ')');
+    }
+
+    public function concat($x, $y) {
+        return new QueryFunction('CONCAT(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+    }
+
+    public function substring($input, $start, $length = null) {
+        if ($length) {
+            return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ', ' . $this->helper->quoteColumnName($length) . ')');
+        } else {
+            return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ')');
+        }
+    }
+
+    public function sum($field) {
+        return new QueryFunction('SUM(' . $this->helper->quoteColumnName($field) . ')');
+    }
+
+    public function lower($field) {
+        return new QueryFunction('LOWER(' . $this->helper->quoteColumnName($field) . ')');
+    }
+
+    public function add($x, $y) {
+        return new QueryFunction($this->helper->quoteColumnName($x) . ' + ' . $this->helper->quoteColumnName($y));
+    }
+
+    public function subtract($x, $y) {
+        return new QueryFunction($this->helper->quoteColumnName($x) . ' - ' . $this->helper->quoteColumnName($y));
+    }
+
+    public function count($count = '', $alias = '') {
+        $alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+        $quotedName = $count === '' ? '*' : $this->helper->quoteColumnName($count);
+        return new QueryFunction('COUNT(' . $quotedName . ')' . $alias);
+    }
+
+    public function max($field) {
+        return new QueryFunction('MAX(' . $this->helper->quoteColumnName($field) . ')');
+    }
+
+    public function min($field) {
+        return new QueryFunction('MIN(' . $this->helper->quoteColumnName($field) . ')');
+    }
+
+    /**
+     * @param string|ILiteral|IParameter|IQueryFunction $x
+     * @param string|ILiteral|IParameter|IQueryFunction $y
+     * @return IQueryFunction
+     */
+    public function greatest($x, $y) {
+        return new QueryFunction('GREATEST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+    }
+
+    /**
+     * @param string|ILiteral|IParameter|IQueryFunction $x
+     * @param string|ILiteral|IParameter|IQueryFunction $y
+     * @return IQueryFunction
+     */
+    public function least($x, $y) {
+        return new QueryFunction('LEAST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -45,49 +45,49 @@ 
 	}
 
 	public function md5($input) {
-		return new QueryFunction('MD5(' . $this->helper->quoteColumnName($input) . ')');
+		return new QueryFunction('MD5('.$this->helper->quoteColumnName($input).')');
 	}
 
 	public function concat($x, $y) {
-		return new QueryFunction('CONCAT(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+		return new QueryFunction('CONCAT('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
 	}
 
 	public function substring($input, $start, $length = null) {
 		if ($length) {
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ', ' . $this->helper->quoteColumnName($length) . ')');
+			return new QueryFunction('SUBSTR('.$this->helper->quoteColumnName($input).', '.$this->helper->quoteColumnName($start).', '.$this->helper->quoteColumnName($length).')');
 		} else {
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ')');
+			return new QueryFunction('SUBSTR('.$this->helper->quoteColumnName($input).', '.$this->helper->quoteColumnName($start).')');
 		}
 	}
 
 	public function sum($field) {
-		return new QueryFunction('SUM(' . $this->helper->quoteColumnName($field) . ')');
+		return new QueryFunction('SUM('.$this->helper->quoteColumnName($field).')');
 	}
 
 	public function lower($field) {
-		return new QueryFunction('LOWER(' . $this->helper->quoteColumnName($field) . ')');
+		return new QueryFunction('LOWER('.$this->helper->quoteColumnName($field).')');
 	}
 
 	public function add($x, $y) {
-		return new QueryFunction($this->helper->quoteColumnName($x) . ' + ' . $this->helper->quoteColumnName($y));
+		return new QueryFunction($this->helper->quoteColumnName($x).' + '.$this->helper->quoteColumnName($y));
 	}
 
 	public function subtract($x, $y) {
-		return new QueryFunction($this->helper->quoteColumnName($x) . ' - ' . $this->helper->quoteColumnName($y));
+		return new QueryFunction($this->helper->quoteColumnName($x).' - '.$this->helper->quoteColumnName($y));
 	}
 
 	public function count($count = '', $alias = '') {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+		$alias = $alias ? (' AS '.$this->helper->quoteColumnName($alias)) : '';
 		$quotedName = $count === '' ? '*' : $this->helper->quoteColumnName($count);
-		return new QueryFunction('COUNT(' . $quotedName . ')' . $alias);
+		return new QueryFunction('COUNT('.$quotedName.')'.$alias);
 	}
 
 	public function max($field) {
-		return new QueryFunction('MAX(' . $this->helper->quoteColumnName($field) . ')');
+		return new QueryFunction('MAX('.$this->helper->quoteColumnName($field).')');
 	}
 
 	public function min($field) {
-		return new QueryFunction('MIN(' . $this->helper->quoteColumnName($field) . ')');
+		return new QueryFunction('MIN('.$this->helper->quoteColumnName($field).')');
 	}
 
 	/**
@@ -96,7 +96,7 @@ 
 	 * @return IQueryFunction
 	 */
 	public function greatest($x, $y) {
-		return new QueryFunction('GREATEST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+		return new QueryFunction('GREATEST('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
 	}
 
 	/**
@@ -105,6 +105,6 @@ 
 	 * @return IQueryFunction
 	 */
 	public function least($x, $y) {
-		return new QueryFunction('LEAST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+		return new QueryFunction('LEAST('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
 	}
 }

lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php

Indentation +39 added lines, -39 removed lines

@@ -29,47 +29,47 @@
 use OCP\DB\QueryBuilder\IQueryFunction;
 
 class OCIFunctionBuilder extends FunctionBuilder {
-	public function md5($input) {
-		return new QueryFunction('LOWER(DBMS_OBFUSCATION_TOOLKIT.md5 (input => UTL_RAW.cast_to_raw(' . $this->helper->quoteColumnName($input) .')))');
-	}
+    public function md5($input) {
+        return new QueryFunction('LOWER(DBMS_OBFUSCATION_TOOLKIT.md5 (input => UTL_RAW.cast_to_raw(' . $this->helper->quoteColumnName($input) .')))');
+    }
 
-	/**
-	 * As per https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions060.htm
-	 * Oracle uses the first value to cast the rest or the values. So when the
-	 * first value is a literal, plain value or column, instead of doing the
-	 * math, it will cast the expression to int and continue with a "0". So when
-	 * the second parameter is a function or column, we have to put that as
-	 * first parameter.
-	 *
-	 * @param string|ILiteral|IParameter|IQueryFunction $x
-	 * @param string|ILiteral|IParameter|IQueryFunction $y
-	 * @return IQueryFunction
-	 */
-	public function greatest($x, $y) {
-		if (is_string($y) || $y instanceof IQueryFunction) {
-			return parent::greatest($y, $x);
-		}
+    /**
+     * As per https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions060.htm
+     * Oracle uses the first value to cast the rest or the values. So when the
+     * first value is a literal, plain value or column, instead of doing the
+     * math, it will cast the expression to int and continue with a "0". So when
+     * the second parameter is a function or column, we have to put that as
+     * first parameter.
+     *
+     * @param string|ILiteral|IParameter|IQueryFunction $x
+     * @param string|ILiteral|IParameter|IQueryFunction $y
+     * @return IQueryFunction
+     */
+    public function greatest($x, $y) {
+        if (is_string($y) || $y instanceof IQueryFunction) {
+            return parent::greatest($y, $x);
+        }
 
-		return parent::greatest($x, $y);
-	}
+        return parent::greatest($x, $y);
+    }
 
-	/**
-	 * As per https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions060.htm
-	 * Oracle uses the first value to cast the rest or the values. So when the
-	 * first value is a literal, plain value or column, instead of doing the
-	 * math, it will cast the expression to int and continue with a "0". So when
-	 * the second parameter is a function or column, we have to put that as
-	 * first parameter.
-	 *
-	 * @param string|ILiteral|IParameter|IQueryFunction $x
-	 * @param string|ILiteral|IParameter|IQueryFunction $y
-	 * @return IQueryFunction
-	 */
-	public function least($x, $y) {
-		if (is_string($y) || $y instanceof IQueryFunction) {
-			return parent::least($y, $x);
-		}
+    /**
+     * As per https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions060.htm
+     * Oracle uses the first value to cast the rest or the values. So when the
+     * first value is a literal, plain value or column, instead of doing the
+     * math, it will cast the expression to int and continue with a "0". So when
+     * the second parameter is a function or column, we have to put that as
+     * first parameter.
+     *
+     * @param string|ILiteral|IParameter|IQueryFunction $x
+     * @param string|ILiteral|IParameter|IQueryFunction $y
+     * @return IQueryFunction
+     */
+    public function least($x, $y) {
+        if (is_string($y) || $y instanceof IQueryFunction) {
+            return parent::least($y, $x);
+        }
 
-		return parent::least($x, $y);
-	}
+        return parent::least($x, $y);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
 class OCIFunctionBuilder extends FunctionBuilder {
 	public function md5($input) {
-		return new QueryFunction('LOWER(DBMS_OBFUSCATION_TOOLKIT.md5 (input => UTL_RAW.cast_to_raw(' . $this->helper->quoteColumnName($input) .')))');
+		return new QueryFunction('LOWER(DBMS_OBFUSCATION_TOOLKIT.md5 (input => UTL_RAW.cast_to_raw('.$this->helper->quoteColumnName($input).')))');
 	}
 
 	/**

lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php

Indentation +19 added lines, -19 removed lines

@@ -30,25 +30,25 @@
 use OCP\DB\QueryBuilder\IQueryFunction;
 
 class SqliteFunctionBuilder extends FunctionBuilder {
-	public function concat($x, $y) {
-		return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')');
-	}
+    public function concat($x, $y) {
+        return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')');
+    }
 
-	/**
-	 * @param string|ILiteral|IParameter|IQueryFunction $x
-	 * @param string|ILiteral|IParameter|IQueryFunction $y
-	 * @return IQueryFunction
-	 */
-	public function greatest($x, $y) {
-		return new QueryFunction('MAX(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
-	}
+    /**
+     * @param string|ILiteral|IParameter|IQueryFunction $x
+     * @param string|ILiteral|IParameter|IQueryFunction $y
+     * @return IQueryFunction
+     */
+    public function greatest($x, $y) {
+        return new QueryFunction('MAX(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+    }
 
-	/**
-	 * @param string|ILiteral|IParameter|IQueryFunction $x
-	 * @param string|ILiteral|IParameter|IQueryFunction $y
-	 * @return IQueryFunction
-	 */
-	public function least($x, $y) {
-		return new QueryFunction('MIN(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
-	}
+    /**
+     * @param string|ILiteral|IParameter|IQueryFunction $x
+     * @param string|ILiteral|IParameter|IQueryFunction $y
+     * @return IQueryFunction
+     */
+    public function least($x, $y) {
+        return new QueryFunction('MIN(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
 
 class SqliteFunctionBuilder extends FunctionBuilder {
 	public function concat($x, $y) {
-		return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')');
+		return new QueryFunction('('.$this->helper->quoteColumnName($x).' || '.$this->helper->quoteColumnName($y).')');
 	}
 
 	/**
@@ -40,7 +40,7 @@ 
 	 * @return IQueryFunction
 	 */
 	public function greatest($x, $y) {
-		return new QueryFunction('MAX(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+		return new QueryFunction('MAX('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
 	}
 
 	/**
@@ -49,6 +49,6 @@ 
 	 * @return IQueryFunction
 	 */
 	public function least($x, $y) {
-		return new QueryFunction('MIN(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+		return new QueryFunction('MIN('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
 	}
 }