nextcloud / server

lib/private/DB/Migrator.php

Indentation +162 added lines, -162 removed lines

@@ -45,166 +45,166 @@
 
 class Migrator {
 
-	/** @var \Doctrine\DBAL\Connection */
-	protected $connection;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var EventDispatcherInterface  */
-	private $dispatcher;
-
-	/** @var bool */
-	private $noEmit = false;
-
-	/**
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @param IConfig $config
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(\Doctrine\DBAL\Connection $connection,
-								IConfig $config,
-								EventDispatcherInterface $dispatcher = null) {
-		$this->connection = $connection;
-		$this->config = $config;
-		$this->dispatcher = $dispatcher;
-	}
-
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $targetSchema
-	 *
-	 * @throws Exception
-	 */
-	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;
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public function createSchema() {
-		$this->connection->getConfiguration()->setSchemaAssetsFilter(function ($asset) {
-			/** @var string|AbstractAsset $asset */
-			$filterExpression = $this->getFilterExpression();
-			if ($asset instanceof AbstractAsset) {
-				return preg_match($filterExpression, $asset->getName()) === 1;
-			}
-			return preg_match($filterExpression, $asset) === 1;
-		});
-		return $this->connection->getSchemaManager()->createSchema();
-	}
-
-	/**
-	 * @param Schema $targetSchema
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @return \Doctrine\DBAL\Schema\SchemaDiff
-	 */
-	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);
-					}
-				}
-			}
-		}
-
-		$this->connection->getConfiguration()->setSchemaAssetsFilter(function ($asset) {
-			/** @var string|AbstractAsset $asset */
-			$filterExpression = $this->getFilterExpression();
-			if ($asset instanceof AbstractAsset) {
-				return preg_match($filterExpression, $asset->getName()) === 1;
-			}
-			return preg_match($filterExpression, $asset) === 1;
-		});
-		$sourceSchema = $connection->getSchemaManager()->createSchema();
-
-		// remove tables we don't know about
-		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
-	 *
-	 * @throws Exception
-	 */
-	protected function applySchema(Schema $targetSchema, \Doctrine\DBAL\Connection $connection = null) {
-		if (is_null($connection)) {
-			$connection = $this->connection;
-		}
-
-		$schemaDiff = $this->getDiff($targetSchema, $connection);
-
-		if (!$connection->getDatabasePlatform() instanceof MySQLPlatform) {
-			$connection->beginTransaction();
-		}
-		$sqls = $schemaDiff->toSql($connection->getDatabasePlatform());
-		$step = 0;
-		foreach ($sqls as $sql) {
-			$this->emit($sql, $step++, count($sqls));
-			$connection->query($sql);
-		}
-		if (!$connection->getDatabasePlatform() instanceof MySQLPlatform) {
-			$connection->commit();
-		}
-	}
-
-	/**
-	 * @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]));
-	}
+    /** @var \Doctrine\DBAL\Connection */
+    protected $connection;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var EventDispatcherInterface  */
+    private $dispatcher;
+
+    /** @var bool */
+    private $noEmit = false;
+
+    /**
+     * @param \Doctrine\DBAL\Connection $connection
+     * @param IConfig $config
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(\Doctrine\DBAL\Connection $connection,
+                                IConfig $config,
+                                EventDispatcherInterface $dispatcher = null) {
+        $this->connection = $connection;
+        $this->config = $config;
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $targetSchema
+     *
+     * @throws Exception
+     */
+    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;
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function createSchema() {
+        $this->connection->getConfiguration()->setSchemaAssetsFilter(function ($asset) {
+            /** @var string|AbstractAsset $asset */
+            $filterExpression = $this->getFilterExpression();
+            if ($asset instanceof AbstractAsset) {
+                return preg_match($filterExpression, $asset->getName()) === 1;
+            }
+            return preg_match($filterExpression, $asset) === 1;
+        });
+        return $this->connection->getSchemaManager()->createSchema();
+    }
+
+    /**
+     * @param Schema $targetSchema
+     * @param \Doctrine\DBAL\Connection $connection
+     * @return \Doctrine\DBAL\Schema\SchemaDiff
+     */
+    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);
+                    }
+                }
+            }
+        }
+
+        $this->connection->getConfiguration()->setSchemaAssetsFilter(function ($asset) {
+            /** @var string|AbstractAsset $asset */
+            $filterExpression = $this->getFilterExpression();
+            if ($asset instanceof AbstractAsset) {
+                return preg_match($filterExpression, $asset->getName()) === 1;
+            }
+            return preg_match($filterExpression, $asset) === 1;
+        });
+        $sourceSchema = $connection->getSchemaManager()->createSchema();
+
+        // remove tables we don't know about
+        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
+     *
+     * @throws Exception
+     */
+    protected function applySchema(Schema $targetSchema, \Doctrine\DBAL\Connection $connection = null) {
+        if (is_null($connection)) {
+            $connection = $this->connection;
+        }
+
+        $schemaDiff = $this->getDiff($targetSchema, $connection);
+
+        if (!$connection->getDatabasePlatform() instanceof MySQLPlatform) {
+            $connection->beginTransaction();
+        }
+        $sqls = $schemaDiff->toSql($connection->getDatabasePlatform());
+        $step = 0;
+        foreach ($sqls as $sql) {
+            $this->emit($sql, $step++, count($sqls));
+            $connection->query($sql);
+        }
+        if (!$connection->getDatabasePlatform() instanceof MySQLPlatform) {
+            $connection->commit();
+        }
+    }
+
+    /**
+     * @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]));
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -100,7 +100,7 @@ 
 	 * @throws Exception
 	 */
 	public function createSchema() {
-		$this->connection->getConfiguration()->setSchemaAssetsFilter(function ($asset) {
+		$this->connection->getConfiguration()->setSchemaAssetsFilter(function($asset) {
 			/** @var string|AbstractAsset $asset */
 			$filterExpression = $this->getFilterExpression();
 			if ($asset instanceof AbstractAsset) {
@@ -129,7 +129,7 @@ 
 			}
 		}
 
-		$this->connection->getConfiguration()->setSchemaAssetsFilter(function ($asset) {
+		$this->connection->getConfiguration()->setSchemaAssetsFilter(function($asset) {
 			/** @var string|AbstractAsset $asset */
 			$filterExpression = $this->getFilterExpression();
 			if ($asset instanceof AbstractAsset) {
@@ -188,14 +188,14 @@ 
 	 * @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) {

lib/private/DB/OracleMigrator.php

Indentation +181 added lines, -181 removed lines

@@ -40,185 +40,185 @@
 
 class OracleMigrator extends Migrator {
 
-	/**
-	 * Quote a column's name but changing the name requires recreating
-	 * the column instance and copying over all properties.
-	 *
-	 * @param Column $column old column
-	 * @return Column new column instance with new name
-	 */
-	protected function quoteColumn(Column $column) {
-		$newColumn = new Column(
-			$this->connection->quoteIdentifier($column->getName()),
-			$column->getType()
-		);
-		$newColumn->setAutoincrement($column->getAutoincrement());
-		$newColumn->setColumnDefinition($column->getColumnDefinition());
-		$newColumn->setComment($column->getComment());
-		$newColumn->setDefault($column->getDefault());
-		$newColumn->setFixed($column->getFixed());
-		$newColumn->setLength($column->getLength());
-		$newColumn->setNotnull($column->getNotnull());
-		$newColumn->setPrecision($column->getPrecision());
-		$newColumn->setScale($column->getScale());
-		$newColumn->setUnsigned($column->getUnsigned());
-		$newColumn->setPlatformOptions($column->getPlatformOptions());
-		$newColumn->setCustomSchemaOptions($column->getPlatformOptions());
-		return $newColumn;
-	}
-
-	/**
-	 * Quote an index's name but changing the name requires recreating
-	 * the index instance and copying over all properties.
-	 *
-	 * @param Index $index old index
-	 * @return Index new index instance with new name
-	 */
-	protected function quoteIndex($index) {
-		return new Index(
-		//TODO migrate existing uppercase indexes, then $this->connection->quoteIdentifier($index->getName()),
-			$index->getName(),
-			array_map(function ($columnName) {
-				return $this->connection->quoteIdentifier($columnName);
-			}, $index->getColumns()),
-			$index->isUnique(),
-			$index->isPrimary(),
-			$index->getFlags(),
-			$index->getOptions()
-		);
-	}
-
-	/**
-	 * Quote an ForeignKeyConstraint's name but changing the name requires recreating
-	 * the ForeignKeyConstraint instance and copying over all properties.
-	 *
-	 * @param ForeignKeyConstraint $fkc old fkc
-	 * @return ForeignKeyConstraint new fkc instance with new name
-	 */
-	protected function quoteForeignKeyConstraint($fkc) {
-		return new ForeignKeyConstraint(
-			array_map(function ($columnName) {
-				return $this->connection->quoteIdentifier($columnName);
-			}, $fkc->getLocalColumns()),
-			$this->connection->quoteIdentifier($fkc->getForeignTableName()),
-			array_map(function ($columnName) {
-				return $this->connection->quoteIdentifier($columnName);
-			}, $fkc->getForeignColumns()),
-			$fkc->getName(),
-			$fkc->getOptions()
-		);
-	}
-
-	/**
-	 * @param Schema $targetSchema
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @return \Doctrine\DBAL\Schema\SchemaDiff
-	 * @throws Exception
-	 */
-	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
-		$schemaDiff = parent::getDiff($targetSchema, $connection);
-
-		// oracle forces us to quote the identifiers
-		$schemaDiff->newTables = array_map(function (Table $table) {
-			return new Table(
-				$this->connection->quoteIdentifier($table->getName()),
-				array_map(function (Column $column) {
-					return $this->quoteColumn($column);
-				}, $table->getColumns()),
-				array_map(function (Index $index) {
-					return $this->quoteIndex($index);
-				}, $table->getIndexes()),
-				[],
-				array_map(function (ForeignKeyConstraint $fck) {
-					return $this->quoteForeignKeyConstraint($fck);
-				}, $table->getForeignKeys()),
-				$table->getOptions()
-			);
-		}, $schemaDiff->newTables);
-
-		$schemaDiff->removedTables = array_map(function (Table $table) {
-			return new Table(
-				$this->connection->quoteIdentifier($table->getName()),
-				$table->getColumns(),
-				$table->getIndexes(),
-				[],
-				$table->getForeignKeys(),
-				$table->getOptions()
-			);
-		}, $schemaDiff->removedTables);
-
-		foreach ($schemaDiff->changedTables as $tableDiff) {
-			$tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name);
-
-			$tableDiff->addedColumns = array_map(function (Column $column) {
-				return $this->quoteColumn($column);
-			}, $tableDiff->addedColumns);
-
-			foreach ($tableDiff->changedColumns as $column) {
-				$column->oldColumnName = $this->connection->quoteIdentifier($column->oldColumnName);
-				// auto increment is not relevant for oracle and can anyhow not be applied on change
-				$column->changedProperties = array_diff($column->changedProperties, ['autoincrement', 'unsigned']);
-			}
-			// remove columns that no longer have changed (because autoincrement and unsigned are not supported)
-			$tableDiff->changedColumns = array_filter($tableDiff->changedColumns, function (ColumnDiff $column) {
-				return count($column->changedProperties) > 0;
-			});
-
-			$tableDiff->removedColumns = array_map(function (Column $column) {
-				return $this->quoteColumn($column);
-			}, $tableDiff->removedColumns);
-
-			$tableDiff->renamedColumns = array_map(function (Column $column) {
-				return $this->quoteColumn($column);
-			}, $tableDiff->renamedColumns);
-
-			$tableDiff->addedIndexes = array_map(function (Index $index) {
-				return $this->quoteIndex($index);
-			}, $tableDiff->addedIndexes);
-
-			$tableDiff->changedIndexes = array_map(function (Index $index) {
-				return $this->quoteIndex($index);
-			}, $tableDiff->changedIndexes);
-
-			$tableDiff->removedIndexes = array_map(function (Index $index) {
-				return $this->quoteIndex($index);
-			}, $tableDiff->removedIndexes);
-
-			$tableDiff->renamedIndexes = array_map(function (Index $index) {
-				return $this->quoteIndex($index);
-			}, $tableDiff->renamedIndexes);
-
-			$tableDiff->addedForeignKeys = array_map(function (ForeignKeyConstraint $fkc) {
-				return $this->quoteForeignKeyConstraint($fkc);
-			}, $tableDiff->addedForeignKeys);
-
-			$tableDiff->changedForeignKeys = array_map(function (ForeignKeyConstraint $fkc) {
-				return $this->quoteForeignKeyConstraint($fkc);
-			}, $tableDiff->changedForeignKeys);
-
-			$tableDiff->removedForeignKeys = array_map(function (ForeignKeyConstraint $fkc) {
-				return $this->quoteForeignKeyConstraint($fkc);
-			}, $tableDiff->removedForeignKeys);
-		}
-
-		return $schemaDiff;
-	}
-
-	/**
-	 * @param $statement
-	 * @return string
-	 */
-	protected function convertStatementToScript($statement) {
-		if (substr($statement, -1) === ';') {
-			return $statement . PHP_EOL . '/' . PHP_EOL;
-		}
-		$script = $statement . ';';
-		$script .= PHP_EOL;
-		$script .= PHP_EOL;
-		return $script;
-	}
-
-	protected function getFilterExpression() {
-		return '/^"' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
-	}
+    /**
+     * Quote a column's name but changing the name requires recreating
+     * the column instance and copying over all properties.
+     *
+     * @param Column $column old column
+     * @return Column new column instance with new name
+     */
+    protected function quoteColumn(Column $column) {
+        $newColumn = new Column(
+            $this->connection->quoteIdentifier($column->getName()),
+            $column->getType()
+        );
+        $newColumn->setAutoincrement($column->getAutoincrement());
+        $newColumn->setColumnDefinition($column->getColumnDefinition());
+        $newColumn->setComment($column->getComment());
+        $newColumn->setDefault($column->getDefault());
+        $newColumn->setFixed($column->getFixed());
+        $newColumn->setLength($column->getLength());
+        $newColumn->setNotnull($column->getNotnull());
+        $newColumn->setPrecision($column->getPrecision());
+        $newColumn->setScale($column->getScale());
+        $newColumn->setUnsigned($column->getUnsigned());
+        $newColumn->setPlatformOptions($column->getPlatformOptions());
+        $newColumn->setCustomSchemaOptions($column->getPlatformOptions());
+        return $newColumn;
+    }
+
+    /**
+     * Quote an index's name but changing the name requires recreating
+     * the index instance and copying over all properties.
+     *
+     * @param Index $index old index
+     * @return Index new index instance with new name
+     */
+    protected function quoteIndex($index) {
+        return new Index(
+        //TODO migrate existing uppercase indexes, then $this->connection->quoteIdentifier($index->getName()),
+            $index->getName(),
+            array_map(function ($columnName) {
+                return $this->connection->quoteIdentifier($columnName);
+            }, $index->getColumns()),
+            $index->isUnique(),
+            $index->isPrimary(),
+            $index->getFlags(),
+            $index->getOptions()
+        );
+    }
+
+    /**
+     * Quote an ForeignKeyConstraint's name but changing the name requires recreating
+     * the ForeignKeyConstraint instance and copying over all properties.
+     *
+     * @param ForeignKeyConstraint $fkc old fkc
+     * @return ForeignKeyConstraint new fkc instance with new name
+     */
+    protected function quoteForeignKeyConstraint($fkc) {
+        return new ForeignKeyConstraint(
+            array_map(function ($columnName) {
+                return $this->connection->quoteIdentifier($columnName);
+            }, $fkc->getLocalColumns()),
+            $this->connection->quoteIdentifier($fkc->getForeignTableName()),
+            array_map(function ($columnName) {
+                return $this->connection->quoteIdentifier($columnName);
+            }, $fkc->getForeignColumns()),
+            $fkc->getName(),
+            $fkc->getOptions()
+        );
+    }
+
+    /**
+     * @param Schema $targetSchema
+     * @param \Doctrine\DBAL\Connection $connection
+     * @return \Doctrine\DBAL\Schema\SchemaDiff
+     * @throws Exception
+     */
+    protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
+        $schemaDiff = parent::getDiff($targetSchema, $connection);
+
+        // oracle forces us to quote the identifiers
+        $schemaDiff->newTables = array_map(function (Table $table) {
+            return new Table(
+                $this->connection->quoteIdentifier($table->getName()),
+                array_map(function (Column $column) {
+                    return $this->quoteColumn($column);
+                }, $table->getColumns()),
+                array_map(function (Index $index) {
+                    return $this->quoteIndex($index);
+                }, $table->getIndexes()),
+                [],
+                array_map(function (ForeignKeyConstraint $fck) {
+                    return $this->quoteForeignKeyConstraint($fck);
+                }, $table->getForeignKeys()),
+                $table->getOptions()
+            );
+        }, $schemaDiff->newTables);
+
+        $schemaDiff->removedTables = array_map(function (Table $table) {
+            return new Table(
+                $this->connection->quoteIdentifier($table->getName()),
+                $table->getColumns(),
+                $table->getIndexes(),
+                [],
+                $table->getForeignKeys(),
+                $table->getOptions()
+            );
+        }, $schemaDiff->removedTables);
+
+        foreach ($schemaDiff->changedTables as $tableDiff) {
+            $tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name);
+
+            $tableDiff->addedColumns = array_map(function (Column $column) {
+                return $this->quoteColumn($column);
+            }, $tableDiff->addedColumns);
+
+            foreach ($tableDiff->changedColumns as $column) {
+                $column->oldColumnName = $this->connection->quoteIdentifier($column->oldColumnName);
+                // auto increment is not relevant for oracle and can anyhow not be applied on change
+                $column->changedProperties = array_diff($column->changedProperties, ['autoincrement', 'unsigned']);
+            }
+            // remove columns that no longer have changed (because autoincrement and unsigned are not supported)
+            $tableDiff->changedColumns = array_filter($tableDiff->changedColumns, function (ColumnDiff $column) {
+                return count($column->changedProperties) > 0;
+            });
+
+            $tableDiff->removedColumns = array_map(function (Column $column) {
+                return $this->quoteColumn($column);
+            }, $tableDiff->removedColumns);
+
+            $tableDiff->renamedColumns = array_map(function (Column $column) {
+                return $this->quoteColumn($column);
+            }, $tableDiff->renamedColumns);
+
+            $tableDiff->addedIndexes = array_map(function (Index $index) {
+                return $this->quoteIndex($index);
+            }, $tableDiff->addedIndexes);
+
+            $tableDiff->changedIndexes = array_map(function (Index $index) {
+                return $this->quoteIndex($index);
+            }, $tableDiff->changedIndexes);
+
+            $tableDiff->removedIndexes = array_map(function (Index $index) {
+                return $this->quoteIndex($index);
+            }, $tableDiff->removedIndexes);
+
+            $tableDiff->renamedIndexes = array_map(function (Index $index) {
+                return $this->quoteIndex($index);
+            }, $tableDiff->renamedIndexes);
+
+            $tableDiff->addedForeignKeys = array_map(function (ForeignKeyConstraint $fkc) {
+                return $this->quoteForeignKeyConstraint($fkc);
+            }, $tableDiff->addedForeignKeys);
+
+            $tableDiff->changedForeignKeys = array_map(function (ForeignKeyConstraint $fkc) {
+                return $this->quoteForeignKeyConstraint($fkc);
+            }, $tableDiff->changedForeignKeys);
+
+            $tableDiff->removedForeignKeys = array_map(function (ForeignKeyConstraint $fkc) {
+                return $this->quoteForeignKeyConstraint($fkc);
+            }, $tableDiff->removedForeignKeys);
+        }
+
+        return $schemaDiff;
+    }
+
+    /**
+     * @param $statement
+     * @return string
+     */
+    protected function convertStatementToScript($statement) {
+        if (substr($statement, -1) === ';') {
+            return $statement . PHP_EOL . '/' . PHP_EOL;
+        }
+        $script = $statement . ';';
+        $script .= PHP_EOL;
+        $script .= PHP_EOL;
+        return $script;
+    }
+
+    protected function getFilterExpression() {
+        return '/^"' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+    }
 }

Spacing +22 added lines, -22 removed lines

@@ -78,7 +78,7 @@ 
 		return new Index(
 		//TODO migrate existing uppercase indexes, then $this->connection->quoteIdentifier($index->getName()),
 			$index->getName(),
-			array_map(function ($columnName) {
+			array_map(function($columnName) {
 				return $this->connection->quoteIdentifier($columnName);
 			}, $index->getColumns()),
 			$index->isUnique(),
@@ -97,11 +97,11 @@ 
 	 */
 	protected function quoteForeignKeyConstraint($fkc) {
 		return new ForeignKeyConstraint(
-			array_map(function ($columnName) {
+			array_map(function($columnName) {
 				return $this->connection->quoteIdentifier($columnName);
 			}, $fkc->getLocalColumns()),
 			$this->connection->quoteIdentifier($fkc->getForeignTableName()),
-			array_map(function ($columnName) {
+			array_map(function($columnName) {
 				return $this->connection->quoteIdentifier($columnName);
 			}, $fkc->getForeignColumns()),
 			$fkc->getName(),
@@ -119,24 +119,24 @@ 
 		$schemaDiff = parent::getDiff($targetSchema, $connection);
 
 		// oracle forces us to quote the identifiers
-		$schemaDiff->newTables = array_map(function (Table $table) {
+		$schemaDiff->newTables = array_map(function(Table $table) {
 			return new Table(
 				$this->connection->quoteIdentifier($table->getName()),
-				array_map(function (Column $column) {
+				array_map(function(Column $column) {
 					return $this->quoteColumn($column);
 				}, $table->getColumns()),
-				array_map(function (Index $index) {
+				array_map(function(Index $index) {
 					return $this->quoteIndex($index);
 				}, $table->getIndexes()),
 				[],
-				array_map(function (ForeignKeyConstraint $fck) {
+				array_map(function(ForeignKeyConstraint $fck) {
 					return $this->quoteForeignKeyConstraint($fck);
 				}, $table->getForeignKeys()),
 				$table->getOptions()
 			);
 		}, $schemaDiff->newTables);
 
-		$schemaDiff->removedTables = array_map(function (Table $table) {
+		$schemaDiff->removedTables = array_map(function(Table $table) {
 			return new Table(
 				$this->connection->quoteIdentifier($table->getName()),
 				$table->getColumns(),
@@ -150,7 +150,7 @@ 
 		foreach ($schemaDiff->changedTables as $tableDiff) {
 			$tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name);
 
-			$tableDiff->addedColumns = array_map(function (Column $column) {
+			$tableDiff->addedColumns = array_map(function(Column $column) {
 				return $this->quoteColumn($column);
 			}, $tableDiff->addedColumns);
 
@@ -160,43 +160,43 @@ 
 				$column->changedProperties = array_diff($column->changedProperties, ['autoincrement', 'unsigned']);
 			}
 			// remove columns that no longer have changed (because autoincrement and unsigned are not supported)
-			$tableDiff->changedColumns = array_filter($tableDiff->changedColumns, function (ColumnDiff $column) {
+			$tableDiff->changedColumns = array_filter($tableDiff->changedColumns, function(ColumnDiff $column) {
 				return count($column->changedProperties) > 0;
 			});
 
-			$tableDiff->removedColumns = array_map(function (Column $column) {
+			$tableDiff->removedColumns = array_map(function(Column $column) {
 				return $this->quoteColumn($column);
 			}, $tableDiff->removedColumns);
 
-			$tableDiff->renamedColumns = array_map(function (Column $column) {
+			$tableDiff->renamedColumns = array_map(function(Column $column) {
 				return $this->quoteColumn($column);
 			}, $tableDiff->renamedColumns);
 
-			$tableDiff->addedIndexes = array_map(function (Index $index) {
+			$tableDiff->addedIndexes = array_map(function(Index $index) {
 				return $this->quoteIndex($index);
 			}, $tableDiff->addedIndexes);
 
-			$tableDiff->changedIndexes = array_map(function (Index $index) {
+			$tableDiff->changedIndexes = array_map(function(Index $index) {
 				return $this->quoteIndex($index);
 			}, $tableDiff->changedIndexes);
 
-			$tableDiff->removedIndexes = array_map(function (Index $index) {
+			$tableDiff->removedIndexes = array_map(function(Index $index) {
 				return $this->quoteIndex($index);
 			}, $tableDiff->removedIndexes);
 
-			$tableDiff->renamedIndexes = array_map(function (Index $index) {
+			$tableDiff->renamedIndexes = array_map(function(Index $index) {
 				return $this->quoteIndex($index);
 			}, $tableDiff->renamedIndexes);
 
-			$tableDiff->addedForeignKeys = array_map(function (ForeignKeyConstraint $fkc) {
+			$tableDiff->addedForeignKeys = array_map(function(ForeignKeyConstraint $fkc) {
 				return $this->quoteForeignKeyConstraint($fkc);
 			}, $tableDiff->addedForeignKeys);
 
-			$tableDiff->changedForeignKeys = array_map(function (ForeignKeyConstraint $fkc) {
+			$tableDiff->changedForeignKeys = array_map(function(ForeignKeyConstraint $fkc) {
 				return $this->quoteForeignKeyConstraint($fkc);
 			}, $tableDiff->changedForeignKeys);
 
-			$tableDiff->removedForeignKeys = array_map(function (ForeignKeyConstraint $fkc) {
+			$tableDiff->removedForeignKeys = array_map(function(ForeignKeyConstraint $fkc) {
 				return $this->quoteForeignKeyConstraint($fkc);
 			}, $tableDiff->removedForeignKeys);
 		}
@@ -210,15 +210,15 @@ 
 	 */
 	protected function convertStatementToScript($statement) {
 		if (substr($statement, -1) === ';') {
-			return $statement . PHP_EOL . '/' . PHP_EOL;
+			return $statement.PHP_EOL.'/'.PHP_EOL;
 		}
-		$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_')).'/';
 	}
 }

lib/private/DB/MySQLMigrator.php

Indentation +19 added lines, -19 removed lines

@@ -27,26 +27,26 @@
 use Doctrine\DBAL\Schema\Schema;
 
 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;
+    }
 }

lib/private/DB/MDB2SchemaManager.php

Indentation +110 added lines, -110 removed lines

@@ -38,124 +38,124 @@
 use Doctrine\DBAL\Schema\Schema;
 
 class MDB2SchemaManager {
-	/** @var Connection $conn */
-	protected $conn;
+    /** @var Connection $conn */
+    protected $conn;
 
-	/**
-	 * @param Connection $conn
-	 */
-	public function __construct($conn) {
-		$this->conn = $conn;
-	}
+    /**
+     * @param Connection $conn
+     */
+    public function __construct($conn) {
+        $this->conn = $conn;
+    }
 
-	/**
-	 * Creates tables from XML file
-	 * @param string $file file to read structure from
-	 * @return bool
-	 *
-	 * TODO: write more documentation
-	 */
-	public function createDbFromStructure($file) {
-		$schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $this->conn->getDatabasePlatform());
-		$toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
-		$toSchema = $schemaReader->loadSchemaFromFile($file, $toSchema);
-		return $this->executeSchemaChange($toSchema);
-	}
+    /**
+     * Creates tables from XML file
+     * @param string $file file to read structure from
+     * @return bool
+     *
+     * TODO: write more documentation
+     */
+    public function createDbFromStructure($file) {
+        $schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $this->conn->getDatabasePlatform());
+        $toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
+        $toSchema = $schemaReader->loadSchemaFromFile($file, $toSchema);
+        return $this->executeSchemaChange($toSchema);
+    }
 
-	/**
-	 * @return \OC\DB\Migrator
-	 */
-	public function getMigrator() {
-		$random = \OC::$server->getSecureRandom();
-		$platform = $this->conn->getDatabasePlatform();
-		$config = \OC::$server->getConfig();
-		$dispatcher = \OC::$server->getEventDispatcher();
-		if ($platform instanceof SqlitePlatform) {
-			return new SQLiteMigrator($this->conn, $config, $dispatcher);
-		} elseif ($platform instanceof OraclePlatform) {
-			return new OracleMigrator($this->conn, $config, $dispatcher);
-		} elseif ($platform instanceof MySQLPlatform) {
-			return new MySQLMigrator($this->conn, $config, $dispatcher);
-		} elseif ($platform instanceof PostgreSQL94Platform) {
-			return new PostgreSqlMigrator($this->conn, $config, $dispatcher);
-		} else {
-			return new Migrator($this->conn, $config, $dispatcher);
-		}
-	}
+    /**
+     * @return \OC\DB\Migrator
+     */
+    public function getMigrator() {
+        $random = \OC::$server->getSecureRandom();
+        $platform = $this->conn->getDatabasePlatform();
+        $config = \OC::$server->getConfig();
+        $dispatcher = \OC::$server->getEventDispatcher();
+        if ($platform instanceof SqlitePlatform) {
+            return new SQLiteMigrator($this->conn, $config, $dispatcher);
+        } elseif ($platform instanceof OraclePlatform) {
+            return new OracleMigrator($this->conn, $config, $dispatcher);
+        } elseif ($platform instanceof MySQLPlatform) {
+            return new MySQLMigrator($this->conn, $config, $dispatcher);
+        } elseif ($platform instanceof PostgreSQL94Platform) {
+            return new PostgreSqlMigrator($this->conn, $config, $dispatcher);
+        } else {
+            return new Migrator($this->conn, $config, $dispatcher);
+        }
+    }
 
-	/**
-	 * Reads database schema from file
-	 *
-	 * @param string $file file to read from
-	 * @return \Doctrine\DBAL\Schema\Schema
-	 */
-	private function readSchemaFromFile($file) {
-		$platform = $this->conn->getDatabasePlatform();
-		$schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $platform);
-		$toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
-		return $schemaReader->loadSchemaFromFile($file, $toSchema);
-	}
+    /**
+     * Reads database schema from file
+     *
+     * @param string $file file to read from
+     * @return \Doctrine\DBAL\Schema\Schema
+     */
+    private function readSchemaFromFile($file) {
+        $platform = $this->conn->getDatabasePlatform();
+        $schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $platform);
+        $toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
+        return $schemaReader->loadSchemaFromFile($file, $toSchema);
+    }
 
-	/**
-	 * update the database scheme
-	 * @param string $file file to read structure from
-	 * @param bool $generateSql only return the sql needed for the upgrade
-	 * @return string|boolean
-	 */
-	public function updateDbFromStructure($file, $generateSql = false) {
-		$toSchema = $this->readSchemaFromFile($file);
-		$migrator = $this->getMigrator();
+    /**
+     * update the database scheme
+     * @param string $file file to read structure from
+     * @param bool $generateSql only return the sql needed for the upgrade
+     * @return string|boolean
+     */
+    public function updateDbFromStructure($file, $generateSql = false) {
+        $toSchema = $this->readSchemaFromFile($file);
+        $migrator = $this->getMigrator();
 
-		if ($generateSql) {
-			return $migrator->generateChangeScript($toSchema);
-		} else {
-			$migrator->migrate($toSchema);
-			return true;
-		}
-	}
+        if ($generateSql) {
+            return $migrator->generateChangeScript($toSchema);
+        } else {
+            $migrator->migrate($toSchema);
+            return true;
+        }
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $schema
-	 * @return string
-	 */
-	public function generateChangeScript($schema) {
-		$migrator = $this->getMigrator();
-		return $migrator->generateChangeScript($schema);
-	}
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $schema
+     * @return string
+     */
+    public function generateChangeScript($schema) {
+        $migrator = $this->getMigrator();
+        return $migrator->generateChangeScript($schema);
+    }
 
-	/**
-	 * remove all tables defined in a database structure xml file
-	 *
-	 * @param string $file the xml file describing the tables
-	 */
-	public function removeDBStructure($file) {
-		$schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $this->conn->getDatabasePlatform());
-		$toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
-		$fromSchema = $schemaReader->loadSchemaFromFile($file, $toSchema);
-		$toSchema = clone $fromSchema;
-		foreach ($toSchema->getTables() as $table) {
-			$toSchema->dropTable($table->getName());
-		}
-		$comparator = new \Doctrine\DBAL\Schema\Comparator();
-		$schemaDiff = $comparator->compare($fromSchema, $toSchema);
-		$this->executeSchemaChange($schemaDiff);
-	}
+    /**
+     * remove all tables defined in a database structure xml file
+     *
+     * @param string $file the xml file describing the tables
+     */
+    public function removeDBStructure($file) {
+        $schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $this->conn->getDatabasePlatform());
+        $toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
+        $fromSchema = $schemaReader->loadSchemaFromFile($file, $toSchema);
+        $toSchema = clone $fromSchema;
+        foreach ($toSchema->getTables() as $table) {
+            $toSchema->dropTable($table->getName());
+        }
+        $comparator = new \Doctrine\DBAL\Schema\Comparator();
+        $schemaDiff = $comparator->compare($fromSchema, $toSchema);
+        $this->executeSchemaChange($schemaDiff);
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema|\Doctrine\DBAL\Schema\SchemaDiff $schema
-	 * @return bool
-	 */
-	private function executeSchemaChange($schema) {
-		$this->conn->beginTransaction();
-		foreach ($schema->toSql($this->conn->getDatabasePlatform()) as $sql) {
-			$this->conn->query($sql);
-		}
-		$this->conn->commit();
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema|\Doctrine\DBAL\Schema\SchemaDiff $schema
+     * @return bool
+     */
+    private function executeSchemaChange($schema) {
+        $this->conn->beginTransaction();
+        foreach ($schema->toSql($this->conn->getDatabasePlatform()) as $sql) {
+            $this->conn->query($sql);
+        }
+        $this->conn->commit();
 
-		if ($this->conn->getDatabasePlatform() instanceof SqlitePlatform) {
-			$this->conn->close();
-			$this->conn->connect();
-		}
-		return true;
-	}
+        if ($this->conn->getDatabasePlatform() instanceof SqlitePlatform) {
+            $this->conn->close();
+            $this->conn->connect();
+        }
+        return true;
+    }
 }