nextcloud / server

lib/private/DB/AdapterOCI8.php

Indentation +19 added lines, -19 removed lines

@@ -27,25 +27,25 @@
 namespace OC\DB;
 
 class AdapterOCI8 extends Adapter {
-	public function lastInsertId($table) {
-		if (is_null($table)) {
-			throw new \InvalidArgumentException('Oracle requires a table name to be passed into lastInsertId()');
-		}
-		if ($table !== null) {
-			$suffix = '_SEQ';
-			$table = '"' . $table . $suffix . '"';
-		}
-		return $this->conn->realLastInsertId($table);
-	}
+    public function lastInsertId($table) {
+        if (is_null($table)) {
+            throw new \InvalidArgumentException('Oracle requires a table name to be passed into lastInsertId()');
+        }
+        if ($table !== null) {
+            $suffix = '_SEQ';
+            $table = '"' . $table . $suffix . '"';
+        }
+        return $this->conn->realLastInsertId($table);
+    }
 
-	const UNIX_TIMESTAMP_REPLACEMENT = "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400";
+    const UNIX_TIMESTAMP_REPLACEMENT = "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400";
 
-	public function fixupStatement($statement) {
-		$statement = preg_replace('( LIKE \?)', '$0 ESCAPE \'\\\'', $statement);
-		$statement = preg_replace('/`(\w+)` ILIKE \?/', 'REGEXP_LIKE(`$1`, \'^\' || REPLACE(?, \'%\', \'.*\') || \'$\', \'i\')', $statement);
-		$statement = str_replace('`', '"', $statement);
-		$statement = str_ireplace('NOW()', 'CURRENT_TIMESTAMP', $statement);
-		$statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement);
-		return $statement;
-	}
+    public function fixupStatement($statement) {
+        $statement = preg_replace('( LIKE \?)', '$0 ESCAPE \'\\\'', $statement);
+        $statement = preg_replace('/`(\w+)` ILIKE \?/', 'REGEXP_LIKE(`$1`, \'^\' || REPLACE(?, \'%\', \'.*\') || \'$\', \'i\')', $statement);
+        $statement = str_replace('`', '"', $statement);
+        $statement = str_ireplace('NOW()', 'CURRENT_TIMESTAMP', $statement);
+        $statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement);
+        return $statement;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 		}
 		if ($table !== null) {
 			$suffix = '_SEQ';
-			$table = '"' . $table . $suffix . '"';
+			$table = '"'.$table.$suffix.'"';
 		}
 		return $this->conn->realLastInsertId($table);
 	}

lib/private/DB/MySQLMigrator.php

Indentation +19 added lines, -19 removed lines

@@ -29,28 +29,28 @@
 use Doctrine\DBAL\Schema\Table;
 
 class MySQLMigrator extends Migrator {
-	/**
-	 * @param Schema $targetSchema
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @return \Doctrine\DBAL\Schema\SchemaDiff
-	 */
-	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
-		$platform = $connection->getDatabasePlatform();
-		$platform->registerDoctrineTypeMapping('enum', 'string');
-		$platform->registerDoctrineTypeMapping('bit', 'string');
+    /**
+     * @param Schema $targetSchema
+     * @param \Doctrine\DBAL\Connection $connection
+     * @return \Doctrine\DBAL\Schema\SchemaDiff
+     */
+    protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
+        $platform = $connection->getDatabasePlatform();
+        $platform->registerDoctrineTypeMapping('enum', 'string');
+        $platform->registerDoctrineTypeMapping('bit', 'string');
 
-		$schemaDiff = parent::getDiff($targetSchema, $connection);
+        $schemaDiff = parent::getDiff($targetSchema, $connection);
 
-		// identifiers need to be quoted for mysql
-		foreach ($schemaDiff->changedTables as $tableDiff) {
-			$tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name);
-			foreach ($tableDiff->changedColumns as $column) {
-				$column->oldColumnName = $this->connection->quoteIdentifier($column->oldColumnName);
-			}
-		}
+        // identifiers need to be quoted for mysql
+        foreach ($schemaDiff->changedTables as $tableDiff) {
+            $tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name);
+            foreach ($tableDiff->changedColumns as $column) {
+                $column->oldColumnName = $this->connection->quoteIdentifier($column->oldColumnName);
+            }
+        }
 
-		return $schemaDiff;
-	}
+        return $schemaDiff;
+    }
 	
         /**
          * Speed up migration test by disabling autocommit and unique indexes check

lib/private/DB/OCSqlitePlatform.php

Indentation +22 added lines, -22 removed lines

@@ -23,27 +23,27 @@
 namespace OC\DB;
 
 class OCSqlitePlatform extends \Doctrine\DBAL\Platforms\SqlitePlatform {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getColumnDeclarationSQL($name, array $field) {
-		$def = parent::getColumnDeclarationSQL($name, $field);
-		if (!empty($field['autoincrement'])) {
-			$def .= ' PRIMARY KEY AUTOINCREMENT';
-		}
-		return $def;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getColumnDeclarationSQL($name, array $field) {
+        $def = parent::getColumnDeclarationSQL($name, $field);
+        if (!empty($field['autoincrement'])) {
+            $def .= ' PRIMARY KEY AUTOINCREMENT';
+        }
+        return $def;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	protected function _getCreateTableSQL($name, array $columns, array $options = array()){
-		// if auto increment is set the column is already defined as primary key
-		foreach ($columns as $column) {
-			if (!empty($column['autoincrement'])) {
-				$options['primary'] = null;
-			}
-		}
-		return parent::_getCreateTableSQL($name, $columns, $options);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    protected function _getCreateTableSQL($name, array $columns, array $options = array()){
+        // if auto increment is set the column is already defined as primary key
+        foreach ($columns as $column) {
+            if (!empty($column['autoincrement'])) {
+                $options['primary'] = null;
+            }
+        }
+        return parent::_getCreateTableSQL($name, $columns, $options);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	/**
 	 * {@inheritDoc}
 	 */
-	protected function _getCreateTableSQL($name, array $columns, array $options = array()){
+	protected function _getCreateTableSQL($name, array $columns, array $options = array()) {
 		// if auto increment is set the column is already defined as primary key
 		foreach ($columns as $column) {
 			if (!empty($column['autoincrement'])) {

lib/private/DB/QueryBuilder/QueryFunction.php

Indentation +11 added lines, -11 removed lines

@@ -25,17 +25,17 @@
 use OCP\DB\QueryBuilder\IQueryFunction;
 
 class QueryFunction implements IQueryFunction {
-	/** @var string */
-	protected $function;
+    /** @var string */
+    protected $function;
 
-	public function __construct($function) {
-		$this->function = $function;
-	}
+    public function __construct($function) {
+        $this->function = $function;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function __toString() {
-		return (string) $this->function;
-	}
+    /**
+     * @return string
+     */
+    public function __toString() {
+        return (string) $this->function;
+    }
 }

lib/private/DB/QueryBuilder/QuoteHelper.php

Spacing +2 added lines, -2 removed lines

@@ -73,9 +73,9 @@
 				return $string;
 			}
 
-			return $alias . '.`' . $columnName . '`';
+			return $alias.'.`'.$columnName.'`';
 		}
 
-		return '`' . $string . '`';
+		return '`'.$string.'`';
 	}
 }

Indentation +37 added lines, -37 removed lines

@@ -27,50 +27,50 @@
 use OCP\DB\QueryBuilder\IQueryFunction;
 
 class QuoteHelper {
-	/**
-	 * @param array|string|ILiteral|IParameter|IQueryFunction $strings string, Literal or Parameter
-	 * @return array|string
-	 */
-	public function quoteColumnNames($strings) {
-		if (!is_array($strings)) {
-			return $this->quoteColumnName($strings);
-		}
+    /**
+     * @param array|string|ILiteral|IParameter|IQueryFunction $strings string, Literal or Parameter
+     * @return array|string
+     */
+    public function quoteColumnNames($strings) {
+        if (!is_array($strings)) {
+            return $this->quoteColumnName($strings);
+        }
 
-		$return = [];
-		foreach ($strings as $string) {
-			$return[] = $this->quoteColumnName($string);
-		}
+        $return = [];
+        foreach ($strings as $string) {
+            $return[] = $this->quoteColumnName($string);
+        }
 
-		return $return;
-	}
+        return $return;
+    }
 
-	/**
-	 * @param string|ILiteral|IParameter|IQueryFunction $string string, Literal or Parameter
-	 * @return string
-	 */
-	public function quoteColumnName($string) {
-		if ($string instanceof IParameter || $string instanceof ILiteral || $string instanceof IQueryFunction) {
-			return (string) $string;
-		}
+    /**
+     * @param string|ILiteral|IParameter|IQueryFunction $string string, Literal or Parameter
+     * @return string
+     */
+    public function quoteColumnName($string) {
+        if ($string instanceof IParameter || $string instanceof ILiteral || $string instanceof IQueryFunction) {
+            return (string) $string;
+        }
 
-		if ($string === null || $string === 'null' || $string === '*') {
-			return $string;
-		}
+        if ($string === null || $string === 'null' || $string === '*') {
+            return $string;
+        }
 
-		if (!is_string($string)) {
-			throw new \InvalidArgumentException('Only strings, Literals and Parameters are allowed');
-		}
+        if (!is_string($string)) {
+            throw new \InvalidArgumentException('Only strings, Literals and Parameters are allowed');
+        }
 
-		if (substr_count($string, '.')) {
-			list($alias, $columnName) = explode('.', $string, 2);
+        if (substr_count($string, '.')) {
+            list($alias, $columnName) = explode('.', $string, 2);
 
-			if ($columnName === '*') {
-				return $string;
-			}
+            if ($columnName === '*') {
+                return $string;
+            }
 
-			return $alias . '.`' . $columnName . '`';
-		}
+            return $alias . '.`' . $columnName . '`';
+        }
 
-		return '`' . $string . '`';
-	}
+        return '`' . $string . '`';
+    }
 }

lib/private/DB/QueryBuilder/CompositeExpression.php

Indentation +57 added lines, -57 removed lines

@@ -25,69 +25,69 @@
 use OCP\DB\QueryBuilder\ICompositeExpression;
 
 class CompositeExpression implements ICompositeExpression, \Countable {
-	/** @var \Doctrine\DBAL\Query\Expression\CompositeExpression */
-	protected $compositeExpression;
+    /** @var \Doctrine\DBAL\Query\Expression\CompositeExpression */
+    protected $compositeExpression;
 
-	/**
-	 * Constructor.
-	 *
-	 * @param \Doctrine\DBAL\Query\Expression\CompositeExpression $compositeExpression
-	 */
-	public function __construct(\Doctrine\DBAL\Query\Expression\CompositeExpression $compositeExpression) {
-		$this->compositeExpression = $compositeExpression;
-	}
+    /**
+     * Constructor.
+     *
+     * @param \Doctrine\DBAL\Query\Expression\CompositeExpression $compositeExpression
+     */
+    public function __construct(\Doctrine\DBAL\Query\Expression\CompositeExpression $compositeExpression) {
+        $this->compositeExpression = $compositeExpression;
+    }
 
-	/**
-	 * Adds multiple parts to composite expression.
-	 *
-	 * @param array $parts
-	 *
-	 * @return \OCP\DB\QueryBuilder\ICompositeExpression
-	 */
-	public function addMultiple(array $parts = array()) {
-		$this->compositeExpression->addMultiple($parts);
+    /**
+     * Adds multiple parts to composite expression.
+     *
+     * @param array $parts
+     *
+     * @return \OCP\DB\QueryBuilder\ICompositeExpression
+     */
+    public function addMultiple(array $parts = array()) {
+        $this->compositeExpression->addMultiple($parts);
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Adds an expression to composite expression.
-	 *
-	 * @param mixed $part
-	 *
-	 * @return \OCP\DB\QueryBuilder\ICompositeExpression
-	 */
-	public function add($part) {
-		$this->compositeExpression->add($part);
+    /**
+     * Adds an expression to composite expression.
+     *
+     * @param mixed $part
+     *
+     * @return \OCP\DB\QueryBuilder\ICompositeExpression
+     */
+    public function add($part) {
+        $this->compositeExpression->add($part);
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Retrieves the amount of expressions on composite expression.
-	 *
-	 * @return integer
-	 */
-	public function count() {
-		return $this->compositeExpression->count();
-	}
+    /**
+     * Retrieves the amount of expressions on composite expression.
+     *
+     * @return integer
+     */
+    public function count() {
+        return $this->compositeExpression->count();
+    }
 
-	/**
-	 * Returns the type of this composite expression (AND/OR).
-	 *
-	 * @return string
-	 */
-	public function getType() {
-		return $this->compositeExpression->getType();
-	}
+    /**
+     * Returns the type of this composite expression (AND/OR).
+     *
+     * @return string
+     */
+    public function getType() {
+        return $this->compositeExpression->getType();
+    }
 
-	/**
-	 * Retrieves the string representation of this composite expression.
-	 *
-	 * @return string
-	 */
-	public function __toString()
-	{
-		return (string) $this->compositeExpression;
-	}
+    /**
+     * Retrieves the string representation of this composite expression.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return (string) $this->compositeExpression;
+    }
 }

lib/private/DB/QueryBuilder/Literal.php

Indentation +11 added lines, -11 removed lines

@@ -25,17 +25,17 @@
 use OCP\DB\QueryBuilder\ILiteral;
 
 class Literal implements ILiteral{
-	/** @var mixed */
-	protected $literal;
+    /** @var mixed */
+    protected $literal;
 
-	public function __construct($literal) {
-		$this->literal = $literal;
-	}
+    public function __construct($literal) {
+        $this->literal = $literal;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function __toString() {
-		return (string) $this->literal;
-	}
+    /**
+     * @return string
+     */
+    public function __toString() {
+        return (string) $this->literal;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
 use OCP\DB\QueryBuilder\ILiteral;
 
-class Literal implements ILiteral{
+class Literal implements ILiteral {
 	/** @var mixed */
 	protected $literal;
 

lib/private/DB/QueryBuilder/Parameter.php

Indentation +11 added lines, -11 removed lines

@@ -25,17 +25,17 @@
 use OCP\DB\QueryBuilder\IParameter;
 
 class Parameter implements IParameter {
-	/** @var mixed */
-	protected $name;
+    /** @var mixed */
+    protected $name;
 
-	public function __construct($name) {
-		$this->name = $name;
-	}
+    public function __construct($name) {
+        $this->name = $name;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function __toString() {
-		return (string) $this->name;
-	}
+    /**
+     * @return string
+     */
+    public function __toString() {
+        return (string) $this->name;
+    }
 }

lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php

Indentation +128 added lines, -128 removed lines

@@ -33,132 +33,132 @@
 
 class OCIExpressionBuilder extends ExpressionBuilder {
 
-	/**
-	 * @param mixed $column
-	 * @param mixed|null $type
-	 * @return array|IQueryFunction|string
-	 */
-	protected function prepareColumn($column, $type) {
-		if ($type === IQueryBuilder::PARAM_STR && !is_array($column) && !($column instanceof IParameter) && !($column instanceof ILiteral)) {
-			$column = $this->castColumn($column, $type);
-		} else {
-			$column = $this->helper->quoteColumnNames($column);
-		}
-		return $column;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function comparison($x, $operator, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->comparison($x, $operator, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function eq($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->eq($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function neq($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->neq($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function lt($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->lt($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function lte($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->lte($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function gt($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->gt($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function gte($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->gte($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function in($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->in($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function notIn($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->notIn($x, $y);
-	}
-
-	/**
-	 * Returns a IQueryFunction that casts the column to the given type
-	 *
-	 * @param string $column
-	 * @param mixed $type One of IQueryBuilder::PARAM_*
-	 * @return IQueryFunction
-	 */
-	public function castColumn($column, $type) {
-		if ($type === IQueryBuilder::PARAM_STR) {
-			$column = $this->helper->quoteColumnName($column);
-			return new QueryFunction('to_char(' . $column . ')');
-		}
-
-		return parent::castColumn($column, $type);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function iLike($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return new QueryFunction('REGEXP_LIKE('.$x.', \'^\' || REPLACE('.$y.', \'%\', \'.*\') || \'$\', \'i\')');
-	}
+    /**
+     * @param mixed $column
+     * @param mixed|null $type
+     * @return array|IQueryFunction|string
+     */
+    protected function prepareColumn($column, $type) {
+        if ($type === IQueryBuilder::PARAM_STR && !is_array($column) && !($column instanceof IParameter) && !($column instanceof ILiteral)) {
+            $column = $this->castColumn($column, $type);
+        } else {
+            $column = $this->helper->quoteColumnNames($column);
+        }
+        return $column;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function comparison($x, $operator, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->comparison($x, $operator, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function eq($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->eq($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function neq($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->neq($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function lt($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->lt($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function lte($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->lte($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function gt($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->gt($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function gte($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->gte($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function in($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->in($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function notIn($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->notIn($x, $y);
+    }
+
+    /**
+     * Returns a IQueryFunction that casts the column to the given type
+     *
+     * @param string $column
+     * @param mixed $type One of IQueryBuilder::PARAM_*
+     * @return IQueryFunction
+     */
+    public function castColumn($column, $type) {
+        if ($type === IQueryBuilder::PARAM_STR) {
+            $column = $this->helper->quoteColumnName($column);
+            return new QueryFunction('to_char(' . $column . ')');
+        }
+
+        return parent::castColumn($column, $type);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function iLike($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return new QueryFunction('REGEXP_LIKE('.$x.', \'^\' || REPLACE('.$y.', \'%\', \'.*\') || \'$\', \'i\')');
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -147,7 +147,7 @@
 	public function castColumn($column, $type) {
 		if ($type === IQueryBuilder::PARAM_STR) {
 			$column = $this->helper->quoteColumnName($column);
-			return new QueryFunction('to_char(' . $column . ')');
+			return new QueryFunction('to_char('.$column.')');
 		}
 
 		return parent::castColumn($column, $type);