nextcloud / server

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/MySqlExpressionBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	public function iLike($x, $y, $type = null) {
 		$x = $this->helper->quoteColumnName($x);
 		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->charset . '_general_ci LIKE', $y);
+		return $this->expressionBuilder->comparison($x, ' COLLATE '.$this->charset.'_general_ci LIKE', $y);
 	}
 
 }

Indentation +22 added lines, -22 removed lines

@@ -30,27 +30,27 @@
 
 class MySqlExpressionBuilder extends ExpressionBuilder {
 
-	/** @var string */
-	protected $charset;
-
-	/**
-	 * @param \OCP\IDBConnection|Connection $connection
-	 * @param IQueryBuilder $queryBuilder
-	 */
-	public function __construct(IDBConnection $connection, IQueryBuilder $queryBuilder) {
-		parent::__construct($connection, $queryBuilder);
-
-		$params = $connection->getParams();
-		$this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function iLike($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->charset . '_general_ci LIKE', $y);
-	}
+    /** @var string */
+    protected $charset;
+
+    /**
+     * @param \OCP\IDBConnection|Connection $connection
+     * @param IQueryBuilder $queryBuilder
+     */
+    public function __construct(IDBConnection $connection, IQueryBuilder $queryBuilder) {
+        parent::__construct($connection, $queryBuilder);
+
+        $params = $connection->getParams();
+        $this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function iLike($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->charset . '_general_ci LIKE', $y);
+    }
 
 }

lib/private/DB/PgSqlTools.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	* @return null
 	*/
 	public function resynchronizeDatabaseSequences(Connection $conn) {
-		$filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+		$filterExpression = '/^'.preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')).'/';
 		$databaseName = $conn->getDatabase();
 		$conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
 

Indentation +32 added lines, -32 removed lines

@@ -31,41 +31,41 @@
 */
 class PgSqlTools {
 
-	/** @var \OCP\IConfig */
-	private $config;
+    /** @var \OCP\IConfig */
+    private $config;
 
-	/**
-	 * @param \OCP\IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * @param \OCP\IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	* @brief Resynchronizes all sequences of a database after using INSERTs
-	*        without leaving out the auto-incremented column.
-	* @param \OC\DB\Connection $conn
-	* @return null
-	*/
-	public function resynchronizeDatabaseSequences(Connection $conn) {
-		$filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
-		$databaseName = $conn->getDatabase();
-		$conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
+    /**
+     * @brief Resynchronizes all sequences of a database after using INSERTs
+     *        without leaving out the auto-incremented column.
+     * @param \OC\DB\Connection $conn
+     * @return null
+     */
+    public function resynchronizeDatabaseSequences(Connection $conn) {
+        $filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+        $databaseName = $conn->getDatabase();
+        $conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
 
-		foreach ($conn->getSchemaManager()->listSequences() as $sequence) {
-			$sequenceName = $sequence->getName();
-			$sqlInfo = 'SELECT table_schema, table_name, column_name
+        foreach ($conn->getSchemaManager()->listSequences() as $sequence) {
+            $sequenceName = $sequence->getName();
+            $sqlInfo = 'SELECT table_schema, table_name, column_name
 				FROM information_schema.columns
 				WHERE column_default = ? AND table_catalog = ?';
-			$sequenceInfo = $conn->fetchAssoc($sqlInfo, [
-				"nextval('$sequenceName'::regclass)",
-				$databaseName
-			]);
-			$tableName = $sequenceInfo['table_name'];
-			$columnName = $sequenceInfo['column_name'];
-			$sqlMaxId = "SELECT MAX($columnName) FROM $tableName";
-			$sqlSetval = "SELECT setval('$sequenceName', ($sqlMaxId))";
-			$conn->executeQuery($sqlSetval);
-		}
-	}
+            $sequenceInfo = $conn->fetchAssoc($sqlInfo, [
+                "nextval('$sequenceName'::regclass)",
+                $databaseName
+            ]);
+            $tableName = $sequenceInfo['table_name'];
+            $columnName = $sequenceInfo['column_name'];
+            $sqlMaxId = "SELECT MAX($columnName) FROM $tableName";
+            $sqlSetval = "SELECT setval('$sequenceName', ($sqlMaxId))";
+            $conn->executeQuery($sqlSetval);
+        }
+    }
 }

lib/private/DB/PostgreSqlMigrator.php

Indentation +25 added lines, -25 removed lines

@@ -25,32 +25,32 @@
 use Doctrine\DBAL\Schema\Schema;
 
 class PostgreSqlMigrator extends Migrator {
-	/**
-	 * @param Schema $targetSchema
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @return \Doctrine\DBAL\Schema\SchemaDiff
-	 */
-	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
-		$schemaDiff = parent::getDiff($targetSchema, $connection);
+    /**
+     * @param Schema $targetSchema
+     * @param \Doctrine\DBAL\Connection $connection
+     * @return \Doctrine\DBAL\Schema\SchemaDiff
+     */
+    protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
+        $schemaDiff = parent::getDiff($targetSchema, $connection);
 
-		foreach ($schemaDiff->changedTables as $tableDiff) {
-			// fix default value in brackets - pg 9.4 is returning a negative default value in ()
-			// see https://github.com/doctrine/dbal/issues/2427
-			foreach ($tableDiff->changedColumns as $column) {
-				$column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) {
-					if ($changedProperties !== 'default') {
-						return true;
-					}
-					$fromDefault = $column->fromColumn->getDefault();
-					$toDefault = $column->column->getDefault();
-					$fromDefault = trim($fromDefault, "()");
+        foreach ($schemaDiff->changedTables as $tableDiff) {
+            // fix default value in brackets - pg 9.4 is returning a negative default value in ()
+            // see https://github.com/doctrine/dbal/issues/2427
+            foreach ($tableDiff->changedColumns as $column) {
+                $column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) {
+                    if ($changedProperties !== 'default') {
+                        return true;
+                    }
+                    $fromDefault = $column->fromColumn->getDefault();
+                    $toDefault = $column->column->getDefault();
+                    $fromDefault = trim($fromDefault, "()");
 
-					// by intention usage of !=
-					return $fromDefault != $toDefault;
-				});
-			}
-		}
+                    // by intention usage of !=
+                    return $fromDefault != $toDefault;
+                });
+            }
+        }
 
-		return $schemaDiff;
-	}
+        return $schemaDiff;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 			// fix default value in brackets - pg 9.4 is returning a negative default value in ()
 			// see https://github.com/doctrine/dbal/issues/2427
 			foreach ($tableDiff->changedColumns as $column) {
-				$column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) {
+				$column->changedProperties = array_filter($column->changedProperties, function($changedProperties) use ($column) {
 					if ($changedProperties !== 'default') {
 						return true;
 					}

lib/private/DB/AdapterMySQL.php

Indentation +27 added lines, -27 removed lines

@@ -27,31 +27,31 @@
 
 class AdapterMySQL extends Adapter {
 
-	/** @var string */
-	protected $charset;
-
-	/**
-	 * @param string $tableName
-	 */
-	public function lockTable($tableName) {
-		$this->conn->executeUpdate('LOCK TABLES `' .$tableName . '` WRITE');
-	}
-
-	public function unlockTable() {
-		$this->conn->executeUpdate('UNLOCK TABLES');
-	}
-
-	public function fixupStatement($statement) {
-		$statement = str_replace(' ILIKE ', ' COLLATE ' . $this->getCharset() . '_general_ci LIKE ', $statement);
-		return $statement;
-	}
-
-	protected function getCharset() {
-		if (!$this->charset) {
-			$params = $this->conn->getParams();
-			$this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
-		}
-
-		return $this->charset;
-	}
+    /** @var string */
+    protected $charset;
+
+    /**
+     * @param string $tableName
+     */
+    public function lockTable($tableName) {
+        $this->conn->executeUpdate('LOCK TABLES `' .$tableName . '` WRITE');
+    }
+
+    public function unlockTable() {
+        $this->conn->executeUpdate('UNLOCK TABLES');
+    }
+
+    public function fixupStatement($statement) {
+        $statement = str_replace(' ILIKE ', ' COLLATE ' . $this->getCharset() . '_general_ci LIKE ', $statement);
+        return $statement;
+    }
+
+    protected function getCharset() {
+        if (!$this->charset) {
+            $params = $this->conn->getParams();
+            $this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
+        }
+
+        return $this->charset;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 	 * @param string $tableName
 	 */
 	public function lockTable($tableName) {
-		$this->conn->executeUpdate('LOCK TABLES `' .$tableName . '` WRITE');
+		$this->conn->executeUpdate('LOCK TABLES `'.$tableName.'` WRITE');
 	}
 
 	public function unlockTable() {
@@ -42,7 +42,7 @@ 
 	}
 
 	public function fixupStatement($statement) {
-		$statement = str_replace(' ILIKE ', ' COLLATE ' . $this->getCharset() . '_general_ci LIKE ', $statement);
+		$statement = str_replace(' ILIKE ', ' COLLATE '.$this->getCharset().'_general_ci LIKE ', $statement);
 		return $statement;
 	}
 

lib/private/DB/MigrationException.php

Indentation +11 added lines, -11 removed lines

@@ -25,17 +25,17 @@
 
 
 class MigrationException extends \Exception {
-	private $table;
+    private $table;
 
-	public function __construct($table, $message) {
-		$this->table = $table;
-		parent::__construct($message);
-	}
+    public function __construct($table, $message) {
+        $this->table = $table;
+        parent::__construct($message);
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getTable() {
-		return $this->table;
-	}
+    /**
+     * @return string
+     */
+    public function getTable() {
+        return $this->table;
+    }
 }

lib/private/DB/MDB2SchemaWriter.php

Indentation +140 added lines, -140 removed lines

@@ -31,153 +31,153 @@
 
 class MDB2SchemaWriter {
 
-	/**
-	 * @param string $file
-	 * @param \OC\DB\Connection $conn
-	 * @return bool
-	 */
-	static public function saveSchemaToFile($file, \OC\DB\Connection $conn) {
-		$config = \OC::$server->getConfig();
+    /**
+     * @param string $file
+     * @param \OC\DB\Connection $conn
+     * @return bool
+     */
+    static public function saveSchemaToFile($file, \OC\DB\Connection $conn) {
+        $config = \OC::$server->getConfig();
 
-		$xml = new \SimpleXMLElement('<database/>');
-		$xml->addChild('name', $config->getSystemValue('dbname', 'owncloud'));
-		$xml->addChild('create', 'true');
-		$xml->addChild('overwrite', 'false');
-		if($config->getSystemValue('dbtype', 'sqlite') === 'mysql' && $config->getSystemValue('mysql.utf8mb4', false)) {
-			$xml->addChild('charset', 'utf8mb4');
-		} else {
-			$xml->addChild('charset', 'utf8');
-		}
+        $xml = new \SimpleXMLElement('<database/>');
+        $xml->addChild('name', $config->getSystemValue('dbname', 'owncloud'));
+        $xml->addChild('create', 'true');
+        $xml->addChild('overwrite', 'false');
+        if($config->getSystemValue('dbtype', 'sqlite') === 'mysql' && $config->getSystemValue('mysql.utf8mb4', false)) {
+            $xml->addChild('charset', 'utf8mb4');
+        } else {
+            $xml->addChild('charset', 'utf8');
+        }
 
-		// FIX ME: bloody work around
-		if ($config->getSystemValue('dbtype', 'sqlite') === 'oci') {
-			$filterExpression = '/^"' . preg_quote($conn->getPrefix()) . '/';
-		} else {
-			$filterExpression = '/^' . preg_quote($conn->getPrefix()) . '/';
-		}
-		$conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
+        // FIX ME: bloody work around
+        if ($config->getSystemValue('dbtype', 'sqlite') === 'oci') {
+            $filterExpression = '/^"' . preg_quote($conn->getPrefix()) . '/';
+        } else {
+            $filterExpression = '/^' . preg_quote($conn->getPrefix()) . '/';
+        }
+        $conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
 
-		foreach ($conn->getSchemaManager()->listTables() as $table) {
-			self::saveTable($table, $xml->addChild('table'));
-		}
-		file_put_contents($file, $xml->asXML());
-		return true;
-	}
+        foreach ($conn->getSchemaManager()->listTables() as $table) {
+            self::saveTable($table, $xml->addChild('table'));
+        }
+        file_put_contents($file, $xml->asXML());
+        return true;
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @param \SimpleXMLElement $xml
-	 */
-	private static function saveTable($table, $xml) {
-		$xml->addChild('name', $table->getName());
-		$declaration = $xml->addChild('declaration');
-		foreach($table->getColumns() as $column) {
-			self::saveColumn($column, $declaration->addChild('field'));
-		}
-		foreach($table->getIndexes() as $index) {
-			if ($index->getName() == 'PRIMARY') {
-				$autoincrement = false;
-				foreach($index->getColumns() as $column) {
-					if ($table->getColumn($column)->getAutoincrement()) {
-						$autoincrement = true;
-					}
-				}
-				if ($autoincrement) {
-					continue;
-				}
-			}
-			self::saveIndex($index, $declaration->addChild('index'));
-		}
-	}
+    /**
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @param \SimpleXMLElement $xml
+     */
+    private static function saveTable($table, $xml) {
+        $xml->addChild('name', $table->getName());
+        $declaration = $xml->addChild('declaration');
+        foreach($table->getColumns() as $column) {
+            self::saveColumn($column, $declaration->addChild('field'));
+        }
+        foreach($table->getIndexes() as $index) {
+            if ($index->getName() == 'PRIMARY') {
+                $autoincrement = false;
+                foreach($index->getColumns() as $column) {
+                    if ($table->getColumn($column)->getAutoincrement()) {
+                        $autoincrement = true;
+                    }
+                }
+                if ($autoincrement) {
+                    continue;
+                }
+            }
+            self::saveIndex($index, $declaration->addChild('index'));
+        }
+    }
 
-	/**
-	 * @param Column $column
-	 * @param \SimpleXMLElement $xml
-	 */
-	private static function saveColumn($column, $xml) {
-		$xml->addChild('name', $column->getName());
-		switch($column->getType()) {
-			case 'SmallInt':
-			case 'Integer':
-			case 'BigInt':
-				$xml->addChild('type', 'integer');
-				$default = $column->getDefault();
-				if (is_null($default) && $column->getAutoincrement()) {
-					$default = '0';
-				}
-				$xml->addChild('default', $default);
-				$xml->addChild('notnull', self::toBool($column->getNotnull()));
-				if ($column->getAutoincrement()) {
-					$xml->addChild('autoincrement', '1');
-				}
-				if ($column->getUnsigned()) {
-					$xml->addChild('unsigned', 'true');
-				}
-				$length = '4';
-				if ($column->getType() == 'SmallInt') {
-					$length = '2';
-				}
-				elseif ($column->getType() == 'BigInt') {
-					$length = '8';
-				}
-				$xml->addChild('length', $length);
-				break;
-			case 'String':
-				$xml->addChild('type', 'text');
-				$default = trim($column->getDefault());
-				if ($default === '') {
-					$default = false;
-				}
-				$xml->addChild('default', $default);
-				$xml->addChild('notnull', self::toBool($column->getNotnull()));
-				$xml->addChild('length', $column->getLength());
-				break;
-			case 'Text':
-				$xml->addChild('type', 'clob');
-				$xml->addChild('notnull', self::toBool($column->getNotnull()));
-				break;
-			case 'Decimal':
-				$xml->addChild('type', 'decimal');
-				$xml->addChild('default', $column->getDefault());
-				$xml->addChild('notnull', self::toBool($column->getNotnull()));
-				$xml->addChild('length', '15');
-				break;
-			case 'Boolean':
-				$xml->addChild('type', 'integer');
-				$xml->addChild('default', $column->getDefault());
-				$xml->addChild('notnull', self::toBool($column->getNotnull()));
-				$xml->addChild('length', '1');
-				break;
-			case 'DateTime':
-				$xml->addChild('type', 'timestamp');
-				$xml->addChild('default', $column->getDefault());
-				$xml->addChild('notnull', self::toBool($column->getNotnull()));
-				break;
+    /**
+     * @param Column $column
+     * @param \SimpleXMLElement $xml
+     */
+    private static function saveColumn($column, $xml) {
+        $xml->addChild('name', $column->getName());
+        switch($column->getType()) {
+            case 'SmallInt':
+            case 'Integer':
+            case 'BigInt':
+                $xml->addChild('type', 'integer');
+                $default = $column->getDefault();
+                if (is_null($default) && $column->getAutoincrement()) {
+                    $default = '0';
+                }
+                $xml->addChild('default', $default);
+                $xml->addChild('notnull', self::toBool($column->getNotnull()));
+                if ($column->getAutoincrement()) {
+                    $xml->addChild('autoincrement', '1');
+                }
+                if ($column->getUnsigned()) {
+                    $xml->addChild('unsigned', 'true');
+                }
+                $length = '4';
+                if ($column->getType() == 'SmallInt') {
+                    $length = '2';
+                }
+                elseif ($column->getType() == 'BigInt') {
+                    $length = '8';
+                }
+                $xml->addChild('length', $length);
+                break;
+            case 'String':
+                $xml->addChild('type', 'text');
+                $default = trim($column->getDefault());
+                if ($default === '') {
+                    $default = false;
+                }
+                $xml->addChild('default', $default);
+                $xml->addChild('notnull', self::toBool($column->getNotnull()));
+                $xml->addChild('length', $column->getLength());
+                break;
+            case 'Text':
+                $xml->addChild('type', 'clob');
+                $xml->addChild('notnull', self::toBool($column->getNotnull()));
+                break;
+            case 'Decimal':
+                $xml->addChild('type', 'decimal');
+                $xml->addChild('default', $column->getDefault());
+                $xml->addChild('notnull', self::toBool($column->getNotnull()));
+                $xml->addChild('length', '15');
+                break;
+            case 'Boolean':
+                $xml->addChild('type', 'integer');
+                $xml->addChild('default', $column->getDefault());
+                $xml->addChild('notnull', self::toBool($column->getNotnull()));
+                $xml->addChild('length', '1');
+                break;
+            case 'DateTime':
+                $xml->addChild('type', 'timestamp');
+                $xml->addChild('default', $column->getDefault());
+                $xml->addChild('notnull', self::toBool($column->getNotnull()));
+                break;
 
-		}
-	}
+        }
+    }
 
-	/**
-	 * @param Index $index
-	 * @param \SimpleXMLElement $xml
-	 */
-	private static function saveIndex($index, $xml) {
-		$xml->addChild('name', $index->getName());
-		if ($index->isPrimary()) {
-			$xml->addChild('primary', 'true');
-		}
-		elseif ($index->isUnique()) {
-			$xml->addChild('unique', 'true');
-		}
-		foreach($index->getColumns() as $column) {
-			$field = $xml->addChild('field');
-			$field->addChild('name', $column);
-			$field->addChild('sorting', 'ascending');
+    /**
+     * @param Index $index
+     * @param \SimpleXMLElement $xml
+     */
+    private static function saveIndex($index, $xml) {
+        $xml->addChild('name', $index->getName());
+        if ($index->isPrimary()) {
+            $xml->addChild('primary', 'true');
+        }
+        elseif ($index->isUnique()) {
+            $xml->addChild('unique', 'true');
+        }
+        foreach($index->getColumns() as $column) {
+            $field = $xml->addChild('field');
+            $field->addChild('name', $column);
+            $field->addChild('sorting', 'ascending');
 			
-		}
-	}
+        }
+    }
 
-	private static function toBool($bool) {
-		return $bool ? 'true' : 'false';
-	}
+    private static function toBool($bool) {
+        return $bool ? 'true' : 'false';
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -43,7 +43,7 @@ 
 		$xml->addChild('name', $config->getSystemValue('dbname', 'owncloud'));
 		$xml->addChild('create', 'true');
 		$xml->addChild('overwrite', 'false');
-		if($config->getSystemValue('dbtype', 'sqlite') === 'mysql' && $config->getSystemValue('mysql.utf8mb4', false)) {
+		if ($config->getSystemValue('dbtype', 'sqlite') === 'mysql' && $config->getSystemValue('mysql.utf8mb4', false)) {
 			$xml->addChild('charset', 'utf8mb4');
 		} else {
 			$xml->addChild('charset', 'utf8');
@@ -51,9 +51,9 @@ 
 
 		// FIX ME: bloody work around
 		if ($config->getSystemValue('dbtype', 'sqlite') === 'oci') {
-			$filterExpression = '/^"' . preg_quote($conn->getPrefix()) . '/';
+			$filterExpression = '/^"'.preg_quote($conn->getPrefix()).'/';
 		} else {
-			$filterExpression = '/^' . preg_quote($conn->getPrefix()) . '/';
+			$filterExpression = '/^'.preg_quote($conn->getPrefix()).'/';
 		}
 		$conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
 
@@ -71,13 +71,13 @@ 
 	private static function saveTable($table, $xml) {
 		$xml->addChild('name', $table->getName());
 		$declaration = $xml->addChild('declaration');
-		foreach($table->getColumns() as $column) {
+		foreach ($table->getColumns() as $column) {
 			self::saveColumn($column, $declaration->addChild('field'));
 		}
-		foreach($table->getIndexes() as $index) {
+		foreach ($table->getIndexes() as $index) {
 			if ($index->getName() == 'PRIMARY') {
 				$autoincrement = false;
-				foreach($index->getColumns() as $column) {
+				foreach ($index->getColumns() as $column) {
 					if ($table->getColumn($column)->getAutoincrement()) {
 						$autoincrement = true;
 					}
@@ -96,7 +96,7 @@ 
 	 */
 	private static function saveColumn($column, $xml) {
 		$xml->addChild('name', $column->getName());
-		switch($column->getType()) {
+		switch ($column->getType()) {
 			case 'SmallInt':
 			case 'Integer':
 			case 'BigInt':
@@ -169,7 +169,7 @@ 
 		elseif ($index->isUnique()) {
 			$xml->addChild('unique', 'true');
 		}
-		foreach($index->getColumns() as $column) {
+		foreach ($index->getColumns() as $column) {
 			$field = $xml->addChild('field');
 			$field->addChild('name', $column);
 			$field->addChild('sorting', 'ascending');

Braces +2 added lines, -4 removed lines

@@ -116,8 +116,7 @@ 
 				$length = '4';
 				if ($column->getType() == 'SmallInt') {
 					$length = '2';
-				}
-				elseif ($column->getType() == 'BigInt') {
+				} elseif ($column->getType() == 'BigInt') {
 					$length = '8';
 				}
 				$xml->addChild('length', $length);
@@ -165,8 +164,7 @@ 
 		$xml->addChild('name', $index->getName());
 		if ($index->isPrimary()) {
 			$xml->addChild('primary', 'true');
-		}
-		elseif ($index->isUnique()) {
+		} elseif ($index->isUnique()) {
 			$xml->addChild('unique', 'true');
 		}
 		foreach($index->getColumns() as $column) {

lib/private/DB/Migrator.php

Spacing +11 added lines, -11 removed lines

@@ -137,7 +137,7 @@ 
 	 * @return string
 	 */
 	protected function generateTemporaryTableName($name) {
-		return $this->config->getSystemValue('dbtableprefix', 'oc_') . $name . '_' . $this->random->generate(13, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
+		return $this->config->getSystemValue('dbtableprefix', 'oc_').$name.'_'.$this->random->generate(13, ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS);
 	}
 
 	/**
@@ -188,7 +188,7 @@ 
 				$indexName = $index->getName();
 			} else {
 				// avoid conflicts in index names
-				$indexName = $this->config->getSystemValue('dbtableprefix', 'oc_') . $this->random->generate(13, ISecureRandom::CHAR_LOWER);
+				$indexName = $this->config->getSystemValue('dbtableprefix', 'oc_').$this->random->generate(13, ISecureRandom::CHAR_LOWER);
 			}
 			$newIndexes[] = new Index($indexName, $index->getColumns(), $index->isUnique(), $index->isPrimary());
 		}
@@ -268,15 +268,15 @@ 
 		$quotedSource = $this->connection->quoteIdentifier($sourceName);
 		$quotedTarget = $this->connection->quoteIdentifier($targetName);
 
-		$this->connection->exec('CREATE TABLE ' . $quotedTarget . ' (LIKE ' . $quotedSource . ')');
-		$this->connection->exec('INSERT INTO ' . $quotedTarget . ' SELECT * FROM ' . $quotedSource);
+		$this->connection->exec('CREATE TABLE '.$quotedTarget.' (LIKE '.$quotedSource.')');
+		$this->connection->exec('INSERT INTO '.$quotedTarget.' SELECT * FROM '.$quotedSource);
 	}
 
 	/**
 	 * @param string $name
 	 */
 	protected function dropTable($name) {
-		$this->connection->exec('DROP TABLE ' . $this->connection->quoteIdentifier($name));
+		$this->connection->exec('DROP TABLE '.$this->connection->quoteIdentifier($name));
 	}
 
 	/**
@@ -284,30 +284,30 @@ 
 	 * @return string
 	 */
 	protected function convertStatementToScript($statement) {
-		$script = $statement . ';';
+		$script = $statement.';';
 		$script .= PHP_EOL;
 		$script .= PHP_EOL;
 		return $script;
 	}
 
 	protected function getFilterExpression() {
-		return '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+		return '/^'.preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')).'/';
 	}
 
 	protected function emit($sql, $step, $max) {
 		if ($this->noEmit) {
 			return;
 		}
-		if(is_null($this->dispatcher)) {
+		if (is_null($this->dispatcher)) {
 			return;
 		}
-		$this->dispatcher->dispatch('\OC\DB\Migrator::executeSql', new GenericEvent($sql, [$step+1, $max]));
+		$this->dispatcher->dispatch('\OC\DB\Migrator::executeSql', new GenericEvent($sql, [$step + 1, $max]));
 	}
 
 	private function emitCheckStep($tableName, $step, $max) {
-		if(is_null($this->dispatcher)) {
+		if (is_null($this->dispatcher)) {
 			return;
 		}
-		$this->dispatcher->dispatch('\OC\DB\Migrator::checkTable', new GenericEvent($tableName, [$step+1, $max]));
+		$this->dispatcher->dispatch('\OC\DB\Migrator::checkTable', new GenericEvent($tableName, [$step + 1, $max]));
 	}
 }

Indentation +268 added lines, -268 removed lines

@@ -46,272 +46,272 @@
 
 class Migrator {
 
-	/** @var \Doctrine\DBAL\Connection */
-	protected $connection;
-
-	/** @var ISecureRandom */
-	private $random;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var EventDispatcherInterface  */
-	private $dispatcher;
-
-	/** @var bool */
-	private $noEmit = false;
-
-	/**
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @param ISecureRandom $random
-	 * @param IConfig $config
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(\Doctrine\DBAL\Connection $connection,
-								ISecureRandom $random,
-								IConfig $config,
-								EventDispatcherInterface $dispatcher = null) {
-		$this->connection = $connection;
-		$this->random = $random;
-		$this->config = $config;
-		$this->dispatcher = $dispatcher;
-	}
-
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $targetSchema
-	 */
-	public function migrate(Schema $targetSchema) {
-		$this->noEmit = true;
-		$this->applySchema($targetSchema);
-	}
-
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $targetSchema
-	 * @return string
-	 */
-	public function generateChangeScript(Schema $targetSchema) {
-		$schemaDiff = $this->getDiff($targetSchema, $this->connection);
-
-		$script = '';
-		$sqls = $schemaDiff->toSql($this->connection->getDatabasePlatform());
-		foreach ($sqls as $sql) {
-			$script .= $this->convertStatementToScript($sql);
-		}
-
-		return $script;
-	}
-
-	/**
-	 * @param Schema $targetSchema
-	 * @throws \OC\DB\MigrationException
-	 */
-	public function checkMigrate(Schema $targetSchema) {
-		$this->noEmit = true;
-		/**@var \Doctrine\DBAL\Schema\Table[] $tables */
-		$tables = $targetSchema->getTables();
-		$filterExpression = $this->getFilterExpression();
-		$this->connection->getConfiguration()->
-			setFilterSchemaAssetsExpression($filterExpression);
-		$existingTables = $this->connection->getSchemaManager()->listTableNames();
-
-		$step = 0;
-		foreach ($tables as $table) {
-			if (strpos($table->getName(), '.')) {
-				list(, $tableName) = explode('.', $table->getName());
-			} else {
-				$tableName = $table->getName();
-			}
-			$this->emitCheckStep($tableName, $step++, count($tables));
-			// don't need to check for new tables
-			if (array_search($tableName, $existingTables) !== false) {
-				$this->checkTableMigrate($table);
-			}
-		}
-	}
-
-	/**
-	 * Create a unique name for the temporary table
-	 *
-	 * @param string $name
-	 * @return string
-	 */
-	protected function generateTemporaryTableName($name) {
-		return $this->config->getSystemValue('dbtableprefix', 'oc_') . $name . '_' . $this->random->generate(13, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
-	}
-
-	/**
-	 * Check the migration of a table on a copy so we can detect errors before messing with the real table
-	 *
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @throws \OC\DB\MigrationException
-	 */
-	protected function checkTableMigrate(Table $table) {
-		$name = $table->getName();
-		$tmpName = $this->generateTemporaryTableName($name);
-
-		$this->copyTable($name, $tmpName);
-
-		//create the migration schema for the temporary table
-		$tmpTable = $this->renameTableSchema($table, $tmpName);
-		$schemaConfig = new SchemaConfig();
-		$schemaConfig->setName($this->connection->getDatabase());
-		$schema = new Schema([$tmpTable], [], $schemaConfig);
-
-		try {
-			$this->applySchema($schema);
-			$this->dropTable($tmpName);
-		} catch (DBALException $e) {
-			// pgsql needs to commit it's failed transaction before doing anything else
-			if ($this->connection->isTransactionActive()) {
-				$this->connection->commit();
-			}
-			$this->dropTable($tmpName);
-			throw new MigrationException($table->getName(), $e->getMessage());
-		}
-	}
-
-	/**
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @param string $newName
-	 * @return \Doctrine\DBAL\Schema\Table
-	 */
-	protected function renameTableSchema(Table $table, $newName) {
-		/**
-		 * @var \Doctrine\DBAL\Schema\Index[] $indexes
-		 */
-		$indexes = $table->getIndexes();
-		$newIndexes = [];
-		foreach ($indexes as $index) {
-			if ($index->isPrimary()) {
-				// do not rename primary key
-				$indexName = $index->getName();
-			} else {
-				// avoid conflicts in index names
-				$indexName = $this->config->getSystemValue('dbtableprefix', 'oc_') . $this->random->generate(13, ISecureRandom::CHAR_LOWER);
-			}
-			$newIndexes[] = new Index($indexName, $index->getColumns(), $index->isUnique(), $index->isPrimary());
-		}
-
-		// foreign keys are not supported so we just set it to an empty array
-		return new Table($newName, $table->getColumns(), $newIndexes, [], 0, $table->getOptions());
-	}
-
-	public function createSchema() {
-		$filterExpression = $this->getFilterExpression();
-		$this->connection->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
-		return $this->connection->getSchemaManager()->createSchema();
-	}
-
-	/**
-	 * @param Schema $targetSchema
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @return \Doctrine\DBAL\Schema\SchemaDiff
-	 * @throws DBALException
-	 */
-	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
-		// adjust varchar columns with a length higher then getVarcharMaxLength to clob
-		foreach ($targetSchema->getTables() as $table) {
-			foreach ($table->getColumns() as $column) {
-				if ($column->getType() instanceof StringType) {
-					if ($column->getLength() > $connection->getDatabasePlatform()->getVarcharMaxLength()) {
-						$column->setType(Type::getType('text'));
-						$column->setLength(null);
-					}
-				}
-			}
-		}
-
-		$filterExpression = $this->getFilterExpression();
-		$this->connection->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
-		$sourceSchema = $connection->getSchemaManager()->createSchema();
-
-		// remove tables we don't know about
-		/** @var $table \Doctrine\DBAL\Schema\Table */
-		foreach ($sourceSchema->getTables() as $table) {
-			if (!$targetSchema->hasTable($table->getName())) {
-				$sourceSchema->dropTable($table->getName());
-			}
-		}
-		// remove sequences we don't know about
-		foreach ($sourceSchema->getSequences() as $table) {
-			if (!$targetSchema->hasSequence($table->getName())) {
-				$sourceSchema->dropSequence($table->getName());
-			}
-		}
-
-		$comparator = new Comparator();
-		return $comparator->compare($sourceSchema, $targetSchema);
-	}
-
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $targetSchema
-	 * @param \Doctrine\DBAL\Connection $connection
-	 */
-	protected function applySchema(Schema $targetSchema, \Doctrine\DBAL\Connection $connection = null) {
-		if (is_null($connection)) {
-			$connection = $this->connection;
-		}
-
-		$schemaDiff = $this->getDiff($targetSchema, $connection);
-
-		$connection->beginTransaction();
-		$sqls = $schemaDiff->toSql($connection->getDatabasePlatform());
-		$step = 0;
-		foreach ($sqls as $sql) {
-			$this->emit($sql, $step++, count($sqls));
-			$connection->query($sql);
-		}
-		$connection->commit();
-	}
-
-	/**
-	 * @param string $sourceName
-	 * @param string $targetName
-	 */
-	protected function copyTable($sourceName, $targetName) {
-		$quotedSource = $this->connection->quoteIdentifier($sourceName);
-		$quotedTarget = $this->connection->quoteIdentifier($targetName);
-
-		$this->connection->exec('CREATE TABLE ' . $quotedTarget . ' (LIKE ' . $quotedSource . ')');
-		$this->connection->exec('INSERT INTO ' . $quotedTarget . ' SELECT * FROM ' . $quotedSource);
-	}
-
-	/**
-	 * @param string $name
-	 */
-	protected function dropTable($name) {
-		$this->connection->exec('DROP TABLE ' . $this->connection->quoteIdentifier($name));
-	}
-
-	/**
-	 * @param $statement
-	 * @return string
-	 */
-	protected function convertStatementToScript($statement) {
-		$script = $statement . ';';
-		$script .= PHP_EOL;
-		$script .= PHP_EOL;
-		return $script;
-	}
-
-	protected function getFilterExpression() {
-		return '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
-	}
-
-	protected function emit($sql, $step, $max) {
-		if ($this->noEmit) {
-			return;
-		}
-		if(is_null($this->dispatcher)) {
-			return;
-		}
-		$this->dispatcher->dispatch('\OC\DB\Migrator::executeSql', new GenericEvent($sql, [$step+1, $max]));
-	}
-
-	private function emitCheckStep($tableName, $step, $max) {
-		if(is_null($this->dispatcher)) {
-			return;
-		}
-		$this->dispatcher->dispatch('\OC\DB\Migrator::checkTable', new GenericEvent($tableName, [$step+1, $max]));
-	}
+    /** @var \Doctrine\DBAL\Connection */
+    protected $connection;
+
+    /** @var ISecureRandom */
+    private $random;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var EventDispatcherInterface  */
+    private $dispatcher;
+
+    /** @var bool */
+    private $noEmit = false;
+
+    /**
+     * @param \Doctrine\DBAL\Connection $connection
+     * @param ISecureRandom $random
+     * @param IConfig $config
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(\Doctrine\DBAL\Connection $connection,
+                                ISecureRandom $random,
+                                IConfig $config,
+                                EventDispatcherInterface $dispatcher = null) {
+        $this->connection = $connection;
+        $this->random = $random;
+        $this->config = $config;
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $targetSchema
+     */
+    public function migrate(Schema $targetSchema) {
+        $this->noEmit = true;
+        $this->applySchema($targetSchema);
+    }
+
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $targetSchema
+     * @return string
+     */
+    public function generateChangeScript(Schema $targetSchema) {
+        $schemaDiff = $this->getDiff($targetSchema, $this->connection);
+
+        $script = '';
+        $sqls = $schemaDiff->toSql($this->connection->getDatabasePlatform());
+        foreach ($sqls as $sql) {
+            $script .= $this->convertStatementToScript($sql);
+        }
+
+        return $script;
+    }
+
+    /**
+     * @param Schema $targetSchema
+     * @throws \OC\DB\MigrationException
+     */
+    public function checkMigrate(Schema $targetSchema) {
+        $this->noEmit = true;
+        /**@var \Doctrine\DBAL\Schema\Table[] $tables */
+        $tables = $targetSchema->getTables();
+        $filterExpression = $this->getFilterExpression();
+        $this->connection->getConfiguration()->
+            setFilterSchemaAssetsExpression($filterExpression);
+        $existingTables = $this->connection->getSchemaManager()->listTableNames();
+
+        $step = 0;
+        foreach ($tables as $table) {
+            if (strpos($table->getName(), '.')) {
+                list(, $tableName) = explode('.', $table->getName());
+            } else {
+                $tableName = $table->getName();
+            }
+            $this->emitCheckStep($tableName, $step++, count($tables));
+            // don't need to check for new tables
+            if (array_search($tableName, $existingTables) !== false) {
+                $this->checkTableMigrate($table);
+            }
+        }
+    }
+
+    /**
+     * Create a unique name for the temporary table
+     *
+     * @param string $name
+     * @return string
+     */
+    protected function generateTemporaryTableName($name) {
+        return $this->config->getSystemValue('dbtableprefix', 'oc_') . $name . '_' . $this->random->generate(13, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
+    }
+
+    /**
+     * Check the migration of a table on a copy so we can detect errors before messing with the real table
+     *
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @throws \OC\DB\MigrationException
+     */
+    protected function checkTableMigrate(Table $table) {
+        $name = $table->getName();
+        $tmpName = $this->generateTemporaryTableName($name);
+
+        $this->copyTable($name, $tmpName);
+
+        //create the migration schema for the temporary table
+        $tmpTable = $this->renameTableSchema($table, $tmpName);
+        $schemaConfig = new SchemaConfig();
+        $schemaConfig->setName($this->connection->getDatabase());
+        $schema = new Schema([$tmpTable], [], $schemaConfig);
+
+        try {
+            $this->applySchema($schema);
+            $this->dropTable($tmpName);
+        } catch (DBALException $e) {
+            // pgsql needs to commit it's failed transaction before doing anything else
+            if ($this->connection->isTransactionActive()) {
+                $this->connection->commit();
+            }
+            $this->dropTable($tmpName);
+            throw new MigrationException($table->getName(), $e->getMessage());
+        }
+    }
+
+    /**
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @param string $newName
+     * @return \Doctrine\DBAL\Schema\Table
+     */
+    protected function renameTableSchema(Table $table, $newName) {
+        /**
+         * @var \Doctrine\DBAL\Schema\Index[] $indexes
+         */
+        $indexes = $table->getIndexes();
+        $newIndexes = [];
+        foreach ($indexes as $index) {
+            if ($index->isPrimary()) {
+                // do not rename primary key
+                $indexName = $index->getName();
+            } else {
+                // avoid conflicts in index names
+                $indexName = $this->config->getSystemValue('dbtableprefix', 'oc_') . $this->random->generate(13, ISecureRandom::CHAR_LOWER);
+            }
+            $newIndexes[] = new Index($indexName, $index->getColumns(), $index->isUnique(), $index->isPrimary());
+        }
+
+        // foreign keys are not supported so we just set it to an empty array
+        return new Table($newName, $table->getColumns(), $newIndexes, [], 0, $table->getOptions());
+    }
+
+    public function createSchema() {
+        $filterExpression = $this->getFilterExpression();
+        $this->connection->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
+        return $this->connection->getSchemaManager()->createSchema();
+    }
+
+    /**
+     * @param Schema $targetSchema
+     * @param \Doctrine\DBAL\Connection $connection
+     * @return \Doctrine\DBAL\Schema\SchemaDiff
+     * @throws DBALException
+     */
+    protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
+        // adjust varchar columns with a length higher then getVarcharMaxLength to clob
+        foreach ($targetSchema->getTables() as $table) {
+            foreach ($table->getColumns() as $column) {
+                if ($column->getType() instanceof StringType) {
+                    if ($column->getLength() > $connection->getDatabasePlatform()->getVarcharMaxLength()) {
+                        $column->setType(Type::getType('text'));
+                        $column->setLength(null);
+                    }
+                }
+            }
+        }
+
+        $filterExpression = $this->getFilterExpression();
+        $this->connection->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
+        $sourceSchema = $connection->getSchemaManager()->createSchema();
+
+        // remove tables we don't know about
+        /** @var $table \Doctrine\DBAL\Schema\Table */
+        foreach ($sourceSchema->getTables() as $table) {
+            if (!$targetSchema->hasTable($table->getName())) {
+                $sourceSchema->dropTable($table->getName());
+            }
+        }
+        // remove sequences we don't know about
+        foreach ($sourceSchema->getSequences() as $table) {
+            if (!$targetSchema->hasSequence($table->getName())) {
+                $sourceSchema->dropSequence($table->getName());
+            }
+        }
+
+        $comparator = new Comparator();
+        return $comparator->compare($sourceSchema, $targetSchema);
+    }
+
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $targetSchema
+     * @param \Doctrine\DBAL\Connection $connection
+     */
+    protected function applySchema(Schema $targetSchema, \Doctrine\DBAL\Connection $connection = null) {
+        if (is_null($connection)) {
+            $connection = $this->connection;
+        }
+
+        $schemaDiff = $this->getDiff($targetSchema, $connection);
+
+        $connection->beginTransaction();
+        $sqls = $schemaDiff->toSql($connection->getDatabasePlatform());
+        $step = 0;
+        foreach ($sqls as $sql) {
+            $this->emit($sql, $step++, count($sqls));
+            $connection->query($sql);
+        }
+        $connection->commit();
+    }
+
+    /**
+     * @param string $sourceName
+     * @param string $targetName
+     */
+    protected function copyTable($sourceName, $targetName) {
+        $quotedSource = $this->connection->quoteIdentifier($sourceName);
+        $quotedTarget = $this->connection->quoteIdentifier($targetName);
+
+        $this->connection->exec('CREATE TABLE ' . $quotedTarget . ' (LIKE ' . $quotedSource . ')');
+        $this->connection->exec('INSERT INTO ' . $quotedTarget . ' SELECT * FROM ' . $quotedSource);
+    }
+
+    /**
+     * @param string $name
+     */
+    protected function dropTable($name) {
+        $this->connection->exec('DROP TABLE ' . $this->connection->quoteIdentifier($name));
+    }
+
+    /**
+     * @param $statement
+     * @return string
+     */
+    protected function convertStatementToScript($statement) {
+        $script = $statement . ';';
+        $script .= PHP_EOL;
+        $script .= PHP_EOL;
+        return $script;
+    }
+
+    protected function getFilterExpression() {
+        return '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+    }
+
+    protected function emit($sql, $step, $max) {
+        if ($this->noEmit) {
+            return;
+        }
+        if(is_null($this->dispatcher)) {
+            return;
+        }
+        $this->dispatcher->dispatch('\OC\DB\Migrator::executeSql', new GenericEvent($sql, [$step+1, $max]));
+    }
+
+    private function emitCheckStep($tableName, $step, $max) {
+        if(is_null($this->dispatcher)) {
+            return;
+        }
+        $this->dispatcher->dispatch('\OC\DB\Migrator::checkTable', new GenericEvent($tableName, [$step+1, $max]));
+    }
 }

lib/private/DB/SQLiteMigrator.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 	 * @return string
 	 */
 	private function buildTempDatabase() {
-		$dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT . '/data');
+		$dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT.'/data');
 		$tmpFile = uniqid("oc_");
 		return "$dataDir/$tmpFile.db";
 	}

Indentation +53 added lines, -53 removed lines

@@ -32,62 +32,62 @@
 
 class SQLiteMigrator extends Migrator {
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $targetSchema
-	 * @throws \OC\DB\MigrationException
-	 *
-	 * For sqlite we simple make a copy of the entire database, and test the migration on that
-	 */
-	public function checkMigrate(\Doctrine\DBAL\Schema\Schema $targetSchema) {
-		$dbFile = $this->connection->getDatabase();
-		$tmpFile = $this->buildTempDatabase();
-		copy($dbFile, $tmpFile);
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $targetSchema
+     * @throws \OC\DB\MigrationException
+     *
+     * For sqlite we simple make a copy of the entire database, and test the migration on that
+     */
+    public function checkMigrate(\Doctrine\DBAL\Schema\Schema $targetSchema) {
+        $dbFile = $this->connection->getDatabase();
+        $tmpFile = $this->buildTempDatabase();
+        copy($dbFile, $tmpFile);
 
-		$connectionParams = [
-			'path' => $tmpFile,
-			'driver' => 'pdo_sqlite',
-		];
-		$conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams);
-		try {
-			$this->applySchema($targetSchema, $conn);
-			$conn->close();
-			unlink($tmpFile);
-		} catch (DBALException $e) {
-			$conn->close();
-			unlink($tmpFile);
-			throw new MigrationException('', $e->getMessage());
-		}
-	}
+        $connectionParams = [
+            'path' => $tmpFile,
+            'driver' => 'pdo_sqlite',
+        ];
+        $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams);
+        try {
+            $this->applySchema($targetSchema, $conn);
+            $conn->close();
+            unlink($tmpFile);
+        } catch (DBALException $e) {
+            $conn->close();
+            unlink($tmpFile);
+            throw new MigrationException('', $e->getMessage());
+        }
+    }
 
-	/**
-	 * @return string
-	 */
-	private function buildTempDatabase() {
-		$dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT . '/data');
-		$tmpFile = uniqid("oc_");
-		return "$dataDir/$tmpFile.db";
-	}
+    /**
+     * @return string
+     */
+    private function buildTempDatabase() {
+        $dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT . '/data');
+        $tmpFile = uniqid("oc_");
+        return "$dataDir/$tmpFile.db";
+    }
 
-	/**
-	 * @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('tinyint unsigned', 'integer');
-		$platform->registerDoctrineTypeMapping('smallint unsigned', 'integer');
-		$platform->registerDoctrineTypeMapping('varchar ', '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('tinyint unsigned', 'integer');
+        $platform->registerDoctrineTypeMapping('smallint unsigned', 'integer');
+        $platform->registerDoctrineTypeMapping('varchar ', 'string');
 
-		// with sqlite autoincrement columns is of type integer
-		foreach ($targetSchema->getTables() as $table) {
-			foreach ($table->getColumns() as $column) {
-				if ($column->getType() instanceof BigIntType && $column->getAutoincrement()) {
-					$column->setType(Type::getType('integer'));
-				}
-			}
-		}
+        // with sqlite autoincrement columns is of type integer
+        foreach ($targetSchema->getTables() as $table) {
+            foreach ($table->getColumns() as $column) {
+                if ($column->getType() instanceof BigIntType && $column->getAutoincrement()) {
+                    $column->setType(Type::getType('integer'));
+                }
+            }
+        }
 
-		return parent::getDiff($targetSchema, $connection);
-	}
+        return parent::getDiff($targetSchema, $connection);
+    }
 }