Merge pull request #5772 from nextcloud/migrations-install

Install nextcloud via migrations instead of the db_structure.xml

build/files-checker.php

@@ -58,7 +58,6 @@ $expectedFiles = [
 	'COPYING-README',
 	'core',
 	'cron.php',
-	'db_structure.xml',
 	'index.html',
 	'index.php',
 	'issue_template.md',

core/Command/Db/ConvertType.php

@@ -28,6 +28,10 @@
 
 namespace OC\Core\Command\Db;
 
+use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Schema\Table;
+use Doctrine\DBAL\Types\Type;
+use OC\DB\MigrationService;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use \OCP\IConfig;
 use OC\DB\Connection;
@@ -190,7 +194,7 @@ class ConvertType extends Command implements CompletionAwareInterface {
 			$this->clearSchema($toDB, $input, $output);
 		}
 
-		$this->createSchema($toDB, $input, $output);
+		$this->createSchema($fromDB, $toDB, $input, $output);
 
 		$toTables = $this->getTables($toDB);
 		$fromTables = $this->getTables($fromDB);
@@ -217,27 +221,43 @@ class ConvertType extends Command implements CompletionAwareInterface {
 		$this->convertDB($fromDB, $toDB, $intersectingTables, $input, $output);
 	}
 
-	protected function createSchema(Connection $toDB, InputInterface $input, OutputInterface $output) {
+	protected function createSchema(Connection $fromDB, Connection $toDB, InputInterface $input, OutputInterface $output) {
 		$output->writeln('<info>Creating schema in new database</info>');
+
+		$fromMS = new MigrationService('core', $fromDB);
+		$currentMigration = $fromMS->getMigration('current');
+		if ($currentMigration !== '0') {
+			$toMS = new MigrationService('core', $toDB);
+			$toMS->migrate($currentMigration);
+		}
+
 		$schemaManager = new \OC\DB\MDB2SchemaManager($toDB);
-		$schemaManager->createDbFromStructure(\OC::$SERVERROOT.'/db_structure.xml');
 		$apps = $input->getOption('all-apps') ? \OC_App::getAllApps() : \OC_App::getEnabledApps();
 		foreach($apps as $app) {
 			if (file_exists(\OC_App::getAppPath($app).'/appinfo/database.xml')) {
 				$schemaManager->createDbFromStructure(\OC_App::getAppPath($app).'/appinfo/database.xml');
+			} else {
+				// Make sure autoloading works...
+				\OC_App::loadApp($app);
+				$fromMS = new MigrationService($app, $fromDB);
+				$currentMigration = $fromMS->getMigration('current');
+				if ($currentMigration !== '0') {
+					$toMS = new MigrationService($app, $toDB);
+					$toMS->migrate($currentMigration);
+				}
 			}
 		}
 	}
 
 	protected function getToDBConnection(InputInterface $input, OutputInterface $output) {
 		$type = $input->getArgument('type');
-		$connectionParams = array(
+		$connectionParams = $this->connectionFactory->createConnectionParams();
+		$connectionParams = array_merge($connectionParams, [
 			'host' => $input->getArgument('hostname'),
 			'user' => $input->getArgument('username'),
 			'password' => $input->getOption('password'),
 			'dbname' => $input->getArgument('database'),
-			'tablePrefix' => $this->config->getSystemValue('dbtableprefix', 'oc_'),
-		);
+		]);
 		if ($input->getOption('port')) {
 			$connectionParams['port'] = $input->getOption('port');
 		}
@@ -264,18 +284,23 @@ class ConvertType extends Command implements CompletionAwareInterface {
 	/**
 	 * @param Connection $fromDB
 	 * @param Connection $toDB
-	 * @param $table
+	 * @param Table $table
 	 * @param InputInterface $input
 	 * @param OutputInterface $output
 	 * @suppress SqlInjectionChecker
 	 */
-	protected function copyTable(Connection $fromDB, Connection $toDB, $table, InputInterface $input, OutputInterface $output) {
+	protected function copyTable(Connection $fromDB, Connection $toDB, Table $table, InputInterface $input, OutputInterface $output) {
+		if ($table->getName() === $toDB->getPrefix() . 'migrations') {
+			$output->writeln('<comment>Skipping migrations table because it was already filled by running the migrations</comment>');
+			return;
+		}
+
 		$chunkSize = $input->getOption('chunk-size');
 
 		$query = $fromDB->getQueryBuilder();
 		$query->automaticTablePrefix(false);
 		$query->selectAlias($query->createFunction('COUNT(*)'), 'num_entries')
-			->from($table);
+			->from($table->getName());
 		$result = $query->execute();
 		$count = $result->fetchColumn();
 		$result->closeCursor();
@@ -293,12 +318,25 @@ class ConvertType extends Command implements CompletionAwareInterface {
 		$query = $fromDB->getQueryBuilder();
 		$query->automaticTablePrefix(false);
 		$query->select('*')
-			->from($table)
+			->from($table->getName())
 			->setMaxResults($chunkSize);
 
+		try {
+			$orderColumns = $table->getPrimaryKeyColumns();
+		} catch (DBALException $e) {
+			$orderColumns = [];
+			foreach ($table->getColumns() as $column) {
+				$orderColumns[] = $column->getName();
+			}
+		}
+
+		foreach ($orderColumns as $column) {
+			$query->addOrderBy($column);
+		}
+
 		$insertQuery = $toDB->getQueryBuilder();
 		$insertQuery->automaticTablePrefix(false);
-		$insertQuery->insert($table);
+		$insertQuery->insert($table->getName());
 		$parametersCreated = false;
 
 		for ($chunk = 0; $chunk < $numChunks; $chunk++) {
@@ -330,33 +368,35 @@ class ConvertType extends Command implements CompletionAwareInterface {
 		$progress->finish();
 	}
 
-	protected function getColumnType($table, $column) {
-		if (isset($this->columnTypes[$table][$column])) {
-			return $this->columnTypes[$table][$column];
-		}
-		$prefix = $this->config->getSystemValue('dbtableprefix', 'oc_');
-
-		$this->columnTypes[$table][$column] = false;
-
-		if ($table === $prefix . 'cards' && $column === 'carddata') {
-			$this->columnTypes[$table][$column] = IQueryBuilder::PARAM_LOB;
-		} else if ($column === 'calendardata') {
-			if ($table === $prefix . 'calendarobjects' ||
-				$table === $prefix . 'schedulingobjects') {
-				$this->columnTypes[$table][$column] = IQueryBuilder::PARAM_LOB;
-			}
+	protected function getColumnType(Table $table, $columnName) {
+		$tableName = $table->getName();
+		if (isset($this->columnTypes[$tableName][$columnName])) {
+			return $this->columnTypes[$tableName][$columnName];
 		}
 
-		return $this->columnTypes[$table][$column];
+		$type = $table->getColumn($columnName)->getType()->getName();
+
+		switch ($type) {
+			case Type::BLOB:
+			case Type::TEXT:
+				$this->columnTypes[$tableName][$columnName] = IQueryBuilder::PARAM_LOB;
+				break;
+			default:
+				$this->columnTypes[$tableName][$columnName] = false;
+		}
+
+		return $this->columnTypes[$tableName][$columnName];
 	}
 
 	protected function convertDB(Connection $fromDB, Connection $toDB, array $tables, InputInterface $input, OutputInterface $output) {
 		$this->config->setSystemValue('maintenance', true);
+		$schema = $fromDB->createSchema();
+
 		try {
 			// copy table rows
 			foreach($tables as $table) {
 				$output->writeln($table);
-				$this->copyTable($fromDB, $toDB, $table, $input, $output);
+				$this->copyTable($fromDB, $toDB, $schema->getTable($table), $input, $output);
 			}
 			if ($input->getArgument('type') === 'pgsql') {
 				$tools = new \OC\DB\PgSqlTools($this->config);

core/Command/Db/GenerateChangeScript.php

@@ -1,89 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OC\Core\Command\Db;
-
-use Stecman\Component\Symfony\Console\BashCompletion\Completion;
-use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface;
-use Stecman\Component\Symfony\Console\BashCompletion\Completion\ShellPathCompletion;
-use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-class GenerateChangeScript extends Command implements CompletionAwareInterface {
-	protected function configure() {
-		$this
-			->setName('db:generate-change-script')
-			->setDescription('generates the change script from the current connected db to db_structure.xml')
-			->addArgument(
-				'schema-xml',
-				InputArgument::OPTIONAL,
-				'the schema xml to be used as target schema',
-				\OC::$SERVERROOT . '/db_structure.xml'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-
-		$file = $input->getArgument('schema-xml');
-
-		$schemaManager = new \OC\DB\MDB2SchemaManager(\OC::$server->getDatabaseConnection());
-
-		try {
-			$result = $schemaManager->updateDbFromStructure($file, true);
-			$output->writeln($result);
-		} catch (\Exception $e) {
-			$output->writeln('Failed to update database structure ('.$e.')');
-		}
-
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'schema-xml') {
-			$helper = new ShellPathCompletion(
-				$this->getName(),
-				'schema-xml',
-				Completion::TYPE_ARGUMENT
-			);
-			return $helper->run();
-		}
-		return [];
-	}
-}

core/Command/Db/Migrations/GenerateCommand.php

@@ -36,9 +36,9 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class GenerateCommand extends Command {
 
-	private static $_templateSimple =
+	protected static $_templateSimple =
 		'<?php
-namespace <namespace>;
+namespace {{<namespace}};
 
 use Doctrine\DBAL\Schema\Schema;
 use OCP\Migration\SimpleMigrationStep;
@@ -47,7 +47,7 @@ use OCP\Migration\IOutput;
 /**
  * Auto-generated migration step: Please modify to your needs!
  */
-class <classname> extends SimpleMigrationStep {
+class {{classname}} extends SimpleMigrationStep {
 
 	/**
 	 * @param IOutput $output
@@ -66,7 +66,7 @@ class <classname> extends SimpleMigrationStep {
 	 * @since 13.0.0
 	 */
 	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		return null;
+{{schemabody}}
 	}
 
 	/**
@@ -81,7 +81,7 @@ class <classname> extends SimpleMigrationStep {
 ';
 
 	/** @var IDBConnection */
-	private $connection;
+	protected $connection;
 
 	/**
 	 * @param IDBConnection $connection
@@ -123,16 +123,24 @@ class <classname> extends SimpleMigrationStep {
 	/**
 	 * @param MigrationService $ms
 	 * @param string $className
+	 * @param string $schemaBody
 	 * @return string
 	 */
-	private function generateMigration(MigrationService $ms, $className) {
+	protected function generateMigration(MigrationService $ms, $className, $schemaBody = '') {
+		if ($schemaBody === '') {
+			$schemaBody = "\t\t" . 'return null;';
+		}
+
+
 		$placeHolders = [
-			'<namespace>',
-			'<classname>',
+			'{{namespace}}',
+			'{{classname}}',
+			'{{schemabody}}',
 		];
 		$replacements = [
 			$ms->getMigrationsNamespace(),
 			$className,
+			$schemaBody,
 		];
 		$code = str_replace($placeHolders, $replacements, self::$_templateSimple);
 		$dir = $ms->getMigrationsDirectory();
@@ -147,7 +155,7 @@ class <classname> extends SimpleMigrationStep {
 		return $path;
 	}
 
-	private function ensureMigrationDirExists($directory) {
+	protected function ensureMigrationDirExists($directory) {
 		if (file_exists($directory) && is_dir($directory)) {
 			return;
 		}

core/Command/Db/Migrations/GenerateFromSchemaFileCommand.php

@@ -0,0 +1,199 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
+ *
+ * @author Joas Schilling <coding@schilljs.com>
+ * @author Julius Haertl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Core\Command\Db\Migrations;
+
+
+use Doctrine\DBAL\Schema\Schema;
+use OC\DB\MDB2SchemaReader;
+use OC\DB\MigrationService;
+use OC\Migration\ConsoleOutput;
+use OCP\App\IAppManager;
+use OCP\IConfig;
+use OCP\IDBConnection;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class GenerateFromSchemaFileCommand extends GenerateCommand {
+
+	/** @var IConfig */
+	protected $config;
+
+	/** @var IAppManager */
+	protected $appManager;
+
+	public function __construct(IConfig $config, IAppManager $appManager, IDBConnection $connection) {
+		parent::__construct($connection);
+		$this->config = $config;
+		$this->appManager = $appManager;
+	}
+
+
+	protected function configure() {
+		parent::configure();
+
+		$this->setName('migrations:generate-from-schema');
+	}
+
+	public function execute(InputInterface $input, OutputInterface $output) {
+		$appName = $input->getArgument('app');
+		$version = $input->getArgument('version');
+
+		if (!preg_match('/^\d{1,16}$/',$version)) {
+			$output->writeln('<error>The given version is invalid. Only 0-9 are allowed (max. 16 digits)</error>');
+			return 1;
+		}
+
+		$schemaFile = $this->appManager->getAppPath($appName) . '/appinfo/database.xml';
+		if (!file_exists($schemaFile)) {
+			$output->writeln('<error>App ' . $appName . ' does not have a database.xml file</error>');
+			return 2;
+		}
+
+		$reader = new MDB2SchemaReader($this->config, $this->connection->getDatabasePlatform());
+		$schema = new Schema();
+		$reader->loadSchemaFromFile($schemaFile, $schema);
+
+		$schemaBody = $this->schemaToMigration($schema);
+
+		$ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
+
+		$date = date('YmdHis');
+		$path = $this->generateMigration($ms, 'Version' . $version . 'Date' . $date, $schemaBody);
+
+		$output->writeln("New migration class has been generated to <info>$path</info>");
+		return 0;
+	}
+
+	/**
+	 * @param Schema $schema
+	 * @return string
+	 */
+	protected function schemaToMigration(Schema $schema) {
+		$content = <<<'EOT'
+		/** @var Schema $schema */
+		$schema = $schemaClosure();
+
+EOT;
+
+		foreach ($schema->getTables() as $table) {
+			$content .= str_replace('{{table-name}}', substr($table->getName(), 3), <<<'EOT'
+
+		if (!$schema->hasTable('{{table-name}}')) {
+			$table = $schema->createTable('{{table-name}}');
+
+EOT
+			);
+
+			foreach ($table->getColumns() as $column) {
+				$content .= str_replace(['{{name}}', '{{type}}'], [$column->getName(), $column->getType()->getName()], <<<'EOT'
+			$table->addColumn('{{name}}', '{{type}}', [
+
+EOT
+				);
+				if ($column->getAutoincrement()) {
+					$content .= <<<'EOT'
+				'autoincrement' => true,
+
+EOT;
+				}
+				$content .= str_replace('{{notnull}}', $column->getNotnull() ? 'true' : 'false', <<<'EOT'
+				'notnull' => {{notnull}},
+
+EOT
+				);
+				if ($column->getLength() !== null) {
+					$content .= str_replace('{{length}}', $column->getLength(), <<<'EOT'
+				'length' => {{length}},
+
+EOT
+					);
+				}
+				$default = $column->getDefault();
+				if ($default !== null) {
+					$default = is_numeric($default) ? $default : "'$default'";
+					$content .= str_replace('{{default}}', $default, <<<'EOT'
+				'default' => {{default}},
+
+EOT
+					);
+				}
+				$content .= <<<'EOT'
+			]);
+
+EOT;
+			}
+
+			$content .= <<<'EOT'
+
+EOT;
+
+			$primaryKey = $table->getPrimaryKey();
+			if ($primaryKey !== null) {
+				$content .= str_replace('{{columns}}', implode('\', \'', $primaryKey->getUnquotedColumns()), <<<'EOT'
+			$table->setPrimaryKey(['{{columns}}']);
+
+EOT
+				);
+			}
+
+			foreach ($table->getIndexes() as $index) {
+				if ($index->isPrimary()) {
+					continue;
+				}
+
+				if ($index->isUnique()) {
+					$content .= str_replace(
+						['{{columns}}', '{{name}}'],
+						[implode('\', \'', $index->getUnquotedColumns()), $index->getName()],
+						<<<'EOT'
+			$table->addUniqueIndex(['{{columns}}'], '{{name}}');
+
+EOT
+					);
+				} else {
+					$content .= str_replace(
+						['{{columns}}', '{{name}}'],
+						[implode('\', \'', $index->getUnquotedColumns()), $index->getName()],
+						<<<'EOT'
+			$table->addIndex(['{{columns}}'], '{{name}}');
+
+EOT
+					);
+				}
+			}
+
+			$content .= <<<'EOT'
+		}
+
+EOT;
+		}
+
+		$content .= <<<'EOT'
+		return $schema;
+EOT;
+
+		return $content;
+	}
+}

core/Migrations/Version13000Date20170718121200.php

@@ -0,0 +1,897 @@
+<?php
+namespace OC\Core\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use OCP\Migration\SimpleMigrationStep;
+use OCP\Migration\IOutput;
+
+/**
+ * Auto-generated migration step: Please modify to your needs!
+ */
+class Version13000Date20170718121200 extends SimpleMigrationStep {
+
+	/**
+	 * @param IOutput $output
+	 * @param \Closure $schemaClosure The `\Closure` returns a `Schema`
+	 * @param array $options
+	 * @since 13.0.0
+	 */
+	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param \Closure $schemaClosure The `\Closure` returns a `Schema`
+	 * @param array $options
+	 * @return null|Schema
+	 * @since 13.0.0
+	 */
+	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+		/** @var Schema $schema */
+		$schema = $schemaClosure();
+
+		if (!$schema->hasTable('appconfig')) {
+			$table = $schema->createTable('appconfig');
+			$table->addColumn('appid', 'string', [
+				'notnull' => true,
+				'length' => 32,
+				'default' => '',
+			]);
+			$table->addColumn('configkey', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('configvalue', 'text', [
+				'notnull' => false,
+			]);
+			$table->setPrimaryKey(['appid', 'configkey']);
+			$table->addIndex(['configkey'], 'appconfig_config_key_index');
+			$table->addIndex(['appid'], 'appconfig_appid_key');
+		}
+
+		if (!$schema->hasTable('storages')) {
+			$table = $schema->createTable('storages');
+			$table->addColumn('id', 'string', [
+				'notnull' => false,
+				'length' => 64,
+			]);
+			$table->addColumn('numeric_id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 4,
+			]);
+			$table->addColumn('available', 'integer', [
+				'notnull' => true,
+				'default' => 1,
+			]);
+			$table->addColumn('last_checked', 'integer', [
+				'notnull' => false,
+			]);
+			$table->setPrimaryKey(['numeric_id']);
+			$table->addUniqueIndex(['id'], 'storages_id_index');
+		}
+
+		if (!$schema->hasTable('mounts')) {
+			$table = $schema->createTable('mounts');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 4,
+			]);
+			$table->addColumn('storage_id', 'integer', [
+				'notnull' => true,
+			]);
+			$table->addColumn('root_id', 'integer', [
+				'notnull' => true,
+			]);
+			$table->addColumn('user_id', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('mount_point', 'string', [
+				'notnull' => true,
+				'length' => 4000,
+			]);
+			$table->addColumn('mount_id', 'integer', [
+				'notnull' => false,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addIndex(['user_id'], 'mounts_user_index');
+			$table->addIndex(['storage_id'], 'mounts_storage_index');
+			$table->addIndex(['root_id'], 'mounts_root_index');
+			$table->addIndex(['mount_id'], 'mounts_mount_id_index');
+			$table->addUniqueIndex(['user_id', 'root_id'], 'mounts_user_root_index');
+		}
+
+		if (!$schema->hasTable('mimetypes')) {
+			$table = $schema->createTable('mimetypes');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 4,
+			]);
+			$table->addColumn('mimetype', 'string', [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addUniqueIndex(['mimetype'], 'mimetype_id_index');
+		}
+
+		if (!$schema->hasTable('filecache')) {
+			$table = $schema->createTable('filecache');
+			$table->addColumn('fileid', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 4,
+			]);
+			$table->addColumn('storage', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('path', 'string', [
+				'notnull' => false,
+				'length' => 4000,
+			]);
+			$table->addColumn('path_hash', 'string', [
+				'notnull' => true,
+				'length' => 32,
+				'default' => '',
+			]);
+			$table->addColumn('parent', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('name', 'string', [
+				'notnull' => false,
+				'length' => 250,
+			]);
+			$table->addColumn('mimetype', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('mimepart', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('size', 'bigint', [
+				'notnull' => true,
+				'length' => 8,
+				'default' => 0,
+			]);
+			$table->addColumn('mtime', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('storage_mtime', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('encrypted', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('unencrypted_size', 'bigint', [
+				'notnull' => true,
+				'length' => 8,
+				'default' => 0,
+			]);
+			$table->addColumn('etag', 'string', [
+				'notnull' => false,
+				'length' => 40,
+			]);
+			$table->addColumn('permissions', 'integer', [
+				'notnull' => false,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('checksum', 'string', [
+				'notnull' => false,
+				'length' => 255,
+			]);
+			$table->setPrimaryKey(['fileid']);
+			$table->addUniqueIndex(['storage', 'path_hash'], 'fs_storage_path_hash');
+			$table->addIndex(['parent', 'name'], 'fs_parent_name_hash');
+			$table->addIndex(['storage', 'mimetype'], 'fs_storage_mimetype');
+			$table->addIndex(['storage', 'mimepart'], 'fs_storage_mimepart');
+			$table->addIndex(['storage', 'size', 'fileid'], 'fs_storage_size');
+		}
+
+		if (!$schema->hasTable('group_user')) {
+			$table = $schema->createTable('group_user');
+			$table->addColumn('gid', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('uid', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->setPrimaryKey(['gid', 'uid']);
+			$table->addIndex(['uid'], 'gu_uid_index');
+		}
+
+		if (!$schema->hasTable('group_admin')) {
+			$table = $schema->createTable('group_admin');
+			$table->addColumn('gid', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('uid', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->setPrimaryKey(['gid', 'uid']);
+			$table->addIndex(['uid'], 'group_admin_uid');
+		}
+
+		if (!$schema->hasTable('groups')) {
+			$table = $schema->createTable('groups');
+			$table->addColumn('gid', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->setPrimaryKey(['gid']);
+		}
+
+		if (!$schema->hasTable('preferences')) {
+			$table = $schema->createTable('preferences');
+			$table->addColumn('userid', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('appid', 'string', [
+				'notnull' => true,
+				'length' => 32,
+				'default' => '',
+			]);
+			$table->addColumn('configkey', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('configvalue', 'text', [
+				'notnull' => false,
+			]);
+			$table->setPrimaryKey(['userid', 'appid', 'configkey']);
+		}
+
+		if (!$schema->hasTable('properties')) {
+			$table = $schema->createTable('properties');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 4,
+			]);
+			$table->addColumn('userid', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('propertypath', 'string', [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->addColumn('propertyname', 'string', [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->addColumn('propertyvalue', 'text', [
+				'notnull' => true,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addIndex(['userid'], 'property_index');
+		}
+
+		if (!$schema->hasTable('share')) {
+			$table = $schema->createTable('share');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 4,
+			]);
+			$table->addColumn('share_type', 'smallint', [
+				'notnull' => true,
+				'length' => 1,
+				'default' => 0,
+			]);
+			$table->addColumn('share_with', 'string', [
+				'notnull' => false,
+				'length' => 255,
+			]);
+			$table->addColumn('password', 'string', [
+				'notnull' => false,
+				'length' => 255,
+			]);
+			$table->addColumn('uid_owner', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('uid_initiator', 'string', [
+				'notnull' => false,
+				'length' => 64,
+			]);
+			$table->addColumn('parent', 'integer', [
+				'notnull' => false,
+				'length' => 4,
+			]);
+			$table->addColumn('item_type', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('item_source', 'string', [
+				'notnull' => false,
+				'length' => 255,
+			]);
+			$table->addColumn('item_target', 'string', [
+				'notnull' => false,
+				'length' => 255,
+			]);
+			$table->addColumn('file_source', 'integer', [
+				'notnull' => false,
+				'length' => 4,
+			]);
+			$table->addColumn('file_target', 'string', [
+				'notnull' => false,
+				'length' => 512,
+			]);
+			$table->addColumn('permissions', 'smallint', [
+				'notnull' => true,
+				'length' => 1,
+				'default' => 0,
+			]);
+			$table->addColumn('stime', 'bigint', [
+				'notnull' => true,
+				'length' => 8,
+				'default' => 0,
+			]);
+			$table->addColumn('accepted', 'smallint', [
+				'notnull' => true,
+				'length' => 1,
+				'default' => 0,
+			]);
+			$table->addColumn('expiration', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->addColumn('token', 'string', [
+				'notnull' => false,
+				'length' => 32,
+			]);
+			$table->addColumn('mail_send', 'smallint', [
+				'notnull' => true,
+				'length' => 1,
+				'default' => 0,
+			]);
+			$table->addColumn('share_name', 'string', [
+				'notnull' => false,
+				'length' => 64,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addIndex(['item_type', 'share_type'], 'item_share_type_index');
+			$table->addIndex(['file_source'], 'file_source_index');
+			$table->addIndex(['token'], 'token_index');
+		}
+
+		if (!$schema->hasTable('jobs')) {
+			$table = $schema->createTable('jobs');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 4,
+			]);
+			$table->addColumn('class', 'string', [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->addColumn('argument', 'string', [
+				'notnull' => true,
+				'length' => 4000,
+				'default' => '',
+			]);
+			$table->addColumn('last_run', 'integer', [
+				'notnull' => false,
+				'default' => 0,
+			]);
+			$table->addColumn('last_checked', 'integer', [
+				'notnull' => false,
+				'default' => 0,
+			]);
+			$table->addColumn('reserved_at', 'integer', [
+				'notnull' => false,
+				'default' => 0,
+			]);
+			$table->addColumn('execution_duration', 'integer', [
+				'notnull' => true,
+				'default' => 0,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addIndex(['class'], 'job_class_index');
+		}
+
+		if (!$schema->hasTable('users')) {
+			$table = $schema->createTable('users');
+			$table->addColumn('uid', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('displayname', 'string', [
+				'notnull' => false,
+				'length' => 64,
+			]);
+			$table->addColumn('password', 'string', [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->setPrimaryKey(['uid']);
+		}
+
+		if (!$schema->hasTable('authtoken')) {
+			$table = $schema->createTable('authtoken');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 4,
+			]);
+			$table->addColumn('uid', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('login_name', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('password', 'text', [
+				'notnull' => false,
+			]);
+			$table->addColumn('name', 'text', [
+				'notnull' => true,
+				'default' => '',
+			]);
+			$table->addColumn('token', 'string', [
+				'notnull' => true,
+				'length' => 200,
+				'default' => '',
+			]);
+			$table->addColumn('type', 'smallint', [
+				'notnull' => true,
+				'length' => 2,
+				'default' => 0,
+			]);
+			$table->addColumn('remember', 'smallint', [
+				'notnull' => true,
+				'length' => 1,
+				'default' => 0,
+			]);
+			$table->addColumn('last_activity', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('last_check', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('scope', 'text', [
+				'notnull' => false,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addUniqueIndex(['token'], 'authtoken_token_index');
+			$table->addIndex(['last_activity'], 'authtoken_last_activity_index');
+		}
+
+		if (!$schema->hasTable('bruteforce_attempts')) {
+			$table = $schema->createTable('bruteforce_attempts');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 4,
+			]);
+			$table->addColumn('action', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('occurred', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('ip', 'string', [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->addColumn('subnet', 'string', [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->addColumn('metadata', 'string', [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addIndex(['ip'], 'bruteforce_attempts_ip');
+			$table->addIndex(['subnet'], 'bruteforce_attempts_subnet');
+		}
+
+		if (!$schema->hasTable('vcategory')) {
+			$table = $schema->createTable('vcategory');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 4,
+			]);
+			$table->addColumn('uid', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('type', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('category', 'string', [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addIndex(['uid'], 'uid_index');
+			$table->addIndex(['type'], 'type_index');
+			$table->addIndex(['category'], 'category_index');
+		}
+
+		if (!$schema->hasTable('vcategory_to_object')) {
+			$table = $schema->createTable('vcategory_to_object');
+			$table->addColumn('objid', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('categoryid', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('type', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->setPrimaryKey(['categoryid', 'objid', 'type']);
+			$table->addIndex(['objid', 'type'], 'vcategory_objectd_index');
+		}
+
+		if (!$schema->hasTable('systemtag')) {
+			$table = $schema->createTable('systemtag');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 4,
+			]);
+			$table->addColumn('name', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('visibility', 'smallint', [
+				'notnull' => true,
+				'length' => 1,
+				'default' => 1,
+			]);
+			$table->addColumn('editable', 'smallint', [
+				'notnull' => true,
+				'length' => 1,
+				'default' => 1,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addUniqueIndex(['name', 'visibility', 'editable'], 'tag_ident');
+		}
+
+		if (!$schema->hasTable('systemtag_object_mapping')) {
+			$table = $schema->createTable('systemtag_object_mapping');
+			$table->addColumn('objectid', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('objecttype', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('systemtagid', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addUniqueIndex(['objecttype', 'objectid', 'systemtagid'], 'mapping');
+		}
+
+		if (!$schema->hasTable('systemtag_group')) {
+			$table = $schema->createTable('systemtag_group');
+			$table->addColumn('systemtagid', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('gid', 'string', [
+				'notnull' => true,
+			]);
+			$table->setPrimaryKey(['gid', 'systemtagid']);
+		}
+
+		if (!$schema->hasTable('file_locks')) {
+			$table = $schema->createTable('file_locks');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 4,
+			]);
+			$table->addColumn('lock', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('key', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('ttl', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => -1,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addUniqueIndex(['key'], 'lock_key_index');
+			$table->addIndex(['ttl'], 'lock_ttl_index');
+		}
+
+		if (!$schema->hasTable('comments')) {
+			$table = $schema->createTable('comments');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 4,
+			]);
+			$table->addColumn('parent_id', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('topmost_parent_id', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('children_count', 'integer', [
+				'notnull' => true,
+				'length' => 4,
+				'default' => 0,
+			]);
+			$table->addColumn('actor_type', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('actor_id', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('message', 'text', [
+				'notnull' => false,
+			]);
+			$table->addColumn('verb', 'string', [
+				'notnull' => false,
+				'length' => 64,
+			]);
+			$table->addColumn('creation_timestamp', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->addColumn('latest_child_timestamp', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->addColumn('object_type', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('object_id', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addIndex(['parent_id'], 'comments_parent_id_index');
+			$table->addIndex(['topmost_parent_id'], 'comments_topmost_parent_id_idx');
+			$table->addIndex(['object_type', 'object_id', 'creation_timestamp'], 'comments_object_index');
+			$table->addIndex(['actor_type', 'actor_id'], 'comments_actor_index');
+		}
+
+		if (!$schema->hasTable('comments_read_markers')) {
+			$table = $schema->createTable('comments_read_markers');
+			$table->addColumn('user_id', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('marker_datetime', 'datetime', [
+				'notnull' => false,
+			]);
+			$table->addColumn('object_type', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('object_id', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addIndex(['object_type', 'object_id'], 'comments_marker_object_index');
+			$table->addUniqueIndex(['user_id', 'object_type', 'object_id'], 'comments_marker_index');
+		}
+
+		if (!$schema->hasTable('credentials')) {
+			$table = $schema->createTable('credentials');
+			$table->addColumn('user', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('identifier', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('credentials', 'text', [
+				'notnull' => false,
+			]);
+			$table->setPrimaryKey(['user', 'identifier']);
+			$table->addIndex(['user'], 'credentials_user');
+		}
+
+		if (!$schema->hasTable('admin_sections')) {
+			$table = $schema->createTable('admin_sections');
+			$table->addColumn('id', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('class', 'string', [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->addColumn('priority', 'smallint', [
+				'notnull' => true,
+				'length' => 1,
+				'default' => 0,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addUniqueIndex(['class'], 'admin_sections_class');
+		}
+
+		if (!$schema->hasTable('admin_settings')) {
+			$table = $schema->createTable('admin_settings');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 4,
+			]);
+			$table->addColumn('class', 'string', [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->addColumn('section', 'string', [
+				'notnull' => false,
+				'length' => 64,
+			]);
+			$table->addColumn('priority', 'smallint', [
+				'notnull' => true,
+				'length' => 1,
+				'default' => 0,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addUniqueIndex(['class'], 'admin_settings_class');
+			$table->addIndex(['section'], 'admin_settings_section');
+		}
+
+		if (!$schema->hasTable('personal_sections')) {
+			$table = $schema->createTable('personal_sections');
+			$table->addColumn('id', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('class', 'string', [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->addColumn('priority', 'smallint', [
+				'notnull' => true,
+				'length' => 1,
+				'default' => 0,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addUniqueIndex(['class'], 'personal_sections_class');
+		}
+
+		if (!$schema->hasTable('personal_settings')) {
+			$table = $schema->createTable('personal_settings');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 4,
+			]);
+			$table->addColumn('class', 'string', [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->addColumn('section', 'string', [
+				'notnull' => false,
+				'length' => 64,
+			]);
+			$table->addColumn('priority', 'smallint', [
+				'notnull' => true,
+				'length' => 1,
+				'default' => 0,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addUniqueIndex(['class'], 'personal_settings_class');
+			$table->addIndex(['section'], 'personal_settings_section');
+		}
+
+		if (!$schema->hasTable('accounts')) {
+			$table = $schema->createTable('accounts');
+			$table->addColumn('uid', 'string', [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('data', 'text', [
+				'notnull' => true,
+				'default' => '',
+			]);
+			$table->setPrimaryKey(['uid']);
+		}
+		return $schema;
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param \Closure $schemaClosure The `\Closure` returns a `Schema`
+	 * @param array $options
+	 * @since 13.0.0
+	 */
+	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+	}
+}

core/register_command.php

@@ -82,12 +82,12 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
 	$application->add(new OC\Core\Command\Config\System\GetConfig(\OC::$server->getSystemConfig()));
 	$application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));
 
-	$application->add(new OC\Core\Command\Db\GenerateChangeScript());
 	$application->add(new OC\Core\Command\Db\ConvertType(\OC::$server->getConfig(), new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig())));
 	$application->add(new OC\Core\Command\Db\ConvertMysqlToMB4(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection(), \OC::$server->getURLGenerator(), \OC::$server->getLogger()));
 	$application->add(new OC\Core\Command\Db\Migrations\StatusCommand(\OC::$server->getDatabaseConnection()));
 	$application->add(new OC\Core\Command\Db\Migrations\MigrateCommand(\OC::$server->getDatabaseConnection()));
 	$application->add(new OC\Core\Command\Db\Migrations\GenerateCommand(\OC::$server->getDatabaseConnection()));
+	$application->add(new OC\Core\Command\Db\Migrations\GenerateFromSchemaFileCommand(\OC::$server->getConfig(), \OC::$server->getAppManager(), \OC::$server->getDatabaseConnection()));
 	$application->add(new OC\Core\Command\Db\Migrations\ExecuteCommand(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()));
 
 	$application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));

lib/composer/composer/autoload_classmap.php

@@ -423,9 +423,9 @@ return array(
     'OC\\Core\\Command\\Config\\System\\SetConfig' => $baseDir . '/core/Command/Config/System/SetConfig.php',
     'OC\\Core\\Command\\Db\\ConvertMysqlToMB4' => $baseDir . '/core/Command/Db/ConvertMysqlToMB4.php',
     'OC\\Core\\Command\\Db\\ConvertType' => $baseDir . '/core/Command/Db/ConvertType.php',
-    'OC\\Core\\Command\\Db\\GenerateChangeScript' => $baseDir . '/core/Command/Db/GenerateChangeScript.php',
     'OC\\Core\\Command\\Db\\Migrations\\ExecuteCommand' => $baseDir . '/core/Command/Db/Migrations/ExecuteCommand.php',
     'OC\\Core\\Command\\Db\\Migrations\\GenerateCommand' => $baseDir . '/core/Command/Db/Migrations/GenerateCommand.php',
+    'OC\\Core\\Command\\Db\\Migrations\\GenerateFromSchemaFileCommand' => $baseDir . '/core/Command/Db/Migrations/GenerateFromSchemaFileCommand.php',
     'OC\\Core\\Command\\Db\\Migrations\\MigrateCommand' => $baseDir . '/core/Command/Db/Migrations/MigrateCommand.php',
     'OC\\Core\\Command\\Db\\Migrations\\StatusCommand' => $baseDir . '/core/Command/Db/Migrations/StatusCommand.php',
     'OC\\Core\\Command\\Encryption\\ChangeKeyStorageRoot' => $baseDir . '/core/Command/Encryption/ChangeKeyStorageRoot.php',
@@ -489,6 +489,7 @@ return array(
     'OC\\Core\\Controller\\UserController' => $baseDir . '/core/Controller/UserController.php',
     'OC\\Core\\Middleware\\TwoFactorMiddleware' => $baseDir . '/core/Middleware/TwoFactorMiddleware.php',
     'OC\\Core\\Migrations\\Version13000Date20170705121758' => $baseDir . '/core/Migrations/Version13000Date20170705121758.php',
+    'OC\\Core\\Migrations\\Version13000Date20170718121200' => $baseDir . '/core/Migrations/Version13000Date20170718121200.php',
     'OC\\DB\\Adapter' => $baseDir . '/lib/private/DB/Adapter.php',
     'OC\\DB\\AdapterMySQL' => $baseDir . '/lib/private/DB/AdapterMySQL.php',
     'OC\\DB\\AdapterOCI8' => $baseDir . '/lib/private/DB/AdapterOCI8.php',

lib/composer/composer/autoload_static.php

@@ -453,9 +453,9 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OC\\Core\\Command\\Config\\System\\SetConfig' => __DIR__ . '/../../..' . '/core/Command/Config/System/SetConfig.php',
         'OC\\Core\\Command\\Db\\ConvertMysqlToMB4' => __DIR__ . '/../../..' . '/core/Command/Db/ConvertMysqlToMB4.php',
         'OC\\Core\\Command\\Db\\ConvertType' => __DIR__ . '/../../..' . '/core/Command/Db/ConvertType.php',
-        'OC\\Core\\Command\\Db\\GenerateChangeScript' => __DIR__ . '/../../..' . '/core/Command/Db/GenerateChangeScript.php',
         'OC\\Core\\Command\\Db\\Migrations\\ExecuteCommand' => __DIR__ . '/../../..' . '/core/Command/Db/Migrations/ExecuteCommand.php',
         'OC\\Core\\Command\\Db\\Migrations\\GenerateCommand' => __DIR__ . '/../../..' . '/core/Command/Db/Migrations/GenerateCommand.php',
+        'OC\\Core\\Command\\Db\\Migrations\\GenerateFromSchemaFileCommand' => __DIR__ . '/../../..' . '/core/Command/Db/Migrations/GenerateFromSchemaFileCommand.php',
         'OC\\Core\\Command\\Db\\Migrations\\MigrateCommand' => __DIR__ . '/../../..' . '/core/Command/Db/Migrations/MigrateCommand.php',
         'OC\\Core\\Command\\Db\\Migrations\\StatusCommand' => __DIR__ . '/../../..' . '/core/Command/Db/Migrations/StatusCommand.php',
         'OC\\Core\\Command\\Encryption\\ChangeKeyStorageRoot' => __DIR__ . '/../../..' . '/core/Command/Encryption/ChangeKeyStorageRoot.php',
@@ -519,6 +519,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OC\\Core\\Controller\\UserController' => __DIR__ . '/../../..' . '/core/Controller/UserController.php',
         'OC\\Core\\Middleware\\TwoFactorMiddleware' => __DIR__ . '/../../..' . '/core/Middleware/TwoFactorMiddleware.php',
         'OC\\Core\\Migrations\\Version13000Date20170705121758' => __DIR__ . '/../../..' . '/core/Migrations/Version13000Date20170705121758.php',
+        'OC\\Core\\Migrations\\Version13000Date20170718121200' => __DIR__ . '/../../..' . '/core/Migrations/Version13000Date20170718121200.php',
         'OC\\DB\\Adapter' => __DIR__ . '/../../..' . '/lib/private/DB/Adapter.php',
         'OC\\DB\\AdapterMySQL' => __DIR__ . '/../../..' . '/lib/private/DB/AdapterMySQL.php',
         'OC\\DB\\AdapterOCI8' => __DIR__ . '/../../..' . '/lib/private/DB/AdapterOCI8.php',

lib/private/DB/MigrationService.php

@@ -284,7 +284,8 @@ class MigrationService {
 			case 'latest':
 				$this->ensureMigrationsAreLoaded();
 
-				return @end($this->getAvailableVersions());
+				$migrations = $this->getAvailableVersions();
+				return @end($migrations);
 		}
 		return '0';
 	}
@@ -316,7 +317,8 @@ class MigrationService {
 		if (count($m) === 0) {
 			return '0';
 		}
-		return @end(array_values($m));
+		$migrations = array_values($m);
+		return @end($migrations);
 	}
 
 	/**

lib/private/DB/SchemaWrapper.php

@@ -34,7 +34,7 @@ class SchemaWrapper {
 	protected $schema;
 
 	/** @var array */
-	protected $tablesToDelete;
+	protected $tablesToDelete = [];
 
 	/**
 	 * @param IDBConnection $connection

lib/private/Setup.php

@@ -282,8 +282,7 @@ class Setup {
 
 		$class = self::$dbSetupClasses[$dbType];
 		/** @var \OC\Setup\AbstractDatabase $dbSetup */
-		$dbSetup = new $class($l, 'db_structure.xml', $this->config,
-			$this->logger, $this->random);
+		$dbSetup = new $class($l, $this->config, $this->logger, $this->random);
 		$error = array_merge($error, $dbSetup->validate($options));
 
 		// validate the data directory

lib/private/Setup/AbstractDatabase.php

@@ -38,8 +38,6 @@ abstract class AbstractDatabase {
 	/** @var IL10N */
 	protected $trans;
 	/** @var string */
-	protected $dbDefinitionFile;
-	/** @var string */
 	protected $dbUser;
 	/** @var string */
 	protected $dbPassword;
@@ -58,9 +56,8 @@ abstract class AbstractDatabase {
 	/** @var ISecureRandom */
 	protected $random;
 
-	public function __construct(IL10N $trans, $dbDefinitionFile, SystemConfig $config, ILogger $logger, ISecureRandom $random) {
+	public function __construct(IL10N $trans, SystemConfig $config, ILogger $logger, ISecureRandom $random) {
 		$this->trans = $trans;
-		$this->dbDefinitionFile = $dbDefinitionFile;
 		$this->config = $config;
 		$this->logger = $logger;
 		$this->random = $random;

lib/private/Setup/MySQL.php

@@ -51,11 +51,7 @@ class MySQL extends AbstractDatabase {
 
 		//fill the database if needed
 		$query='select count(*) from information_schema.tables where table_schema=? AND table_name = ?';
-		$result = $connection->executeQuery($query, [$this->dbName, $this->tablePrefix.'users']);
-		$row = $result->fetch();
-		if (!$row or $row['count(*)'] === '0') {
-			\OC_DB::createDbFromStructure($this->dbDefinitionFile);
-		}
+		$connection->executeQuery($query, [$this->dbName, $this->tablePrefix.'users']);
 	}
 
 	/**

lib/private/Setup/OCI.php

@@ -165,14 +165,7 @@ class OCI extends AbstractDatabase {
 			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
 			$this->logger->warning( $entry, ['app' => 'setup.oci']);
 		}
-		$result = oci_execute($stmt);
-
-		if($result) {
-			$row = oci_fetch_row($stmt);
-		}
-		if(!$result or $row[0]==0) {
-			\OC_DB::createDbFromStructure($this->dbDefinitionFile);
-		}
+		oci_execute($stmt);
 	}
 
 	/**

lib/private/Setup/PostgreSQL.php

@@ -105,11 +105,6 @@ class PostgreSQL extends AbstractDatabase {
 			throw new \OC\DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
 				$this->trans->t('You need to enter details of an existing account.'));
 		}
-
-
-		if (!$tablesSetup) {
-			\OC_DB::createDbFromStructure($this->dbDefinitionFile);
-		}
 	}
 
 	private function createDatabase(IDBConnection $connection) {

lib/private/Setup/Sqlite.php

@@ -41,6 +41,5 @@ class Sqlite extends AbstractDatabase {
 		}
 		//in case of sqlite, we can always fill the database
 		error_log("creating sqlite db");
-		\OC_DB::createDbFromStructure($this->dbDefinitionFile);
 	}
 }

version.php

@@ -26,7 +26,7 @@
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
 
-$OC_Version = array(13, 0, 0, 1);
+$OC_Version = array(13, 0, 0, 2);
 
 // The human readable string
 $OC_VersionString = '13.0.0 alpha';