From bbfc044ac5708900f6c6d246a88b656a0bb1292f Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 5 Jul 2017 14:44:24 +0200
Subject: [PATCH] Add migration for personal settings stuff
Signed-off-by: Joas Schilling <coding@schilljs.com>
---
.../Version13000Date20170705121758.php | 93 +++++++++++++++++++
lib/private/DB/MigrationService.php | 2 +-
lib/private/Updater.php | 6 +-
3 files changed, 96 insertions(+), 5 deletions(-)
create mode 100644 core/Migrations/Version13000Date20170705121758.php
diff --git a/core/Migrations/Version13000Date20170705121758.php b/core/Migrations/Version13000Date20170705121758.php
new file mode 100644
index 00000000000..6f9c2d243f8
--- /dev/null
+++ b/core/Migrations/Version13000Date20170705121758.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
+ *
+ * @author Joas Schilling <coding@schilljs.com>
+ *
+ * @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\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Types\Type;
+use OCP\Migration\SimpleMigrationStep;
+use OCP\Migration\IOutput;
+
+class Version13000Date20170705121758 extends SimpleMigrationStep {
+ /**
+ * @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('personal_sections')) {
+ $table = $schema->createTable('personal_sections');
+
+ $table->addColumn('id', Type::STRING, [
+ 'notnull' => false,
+ 'length' => 64,
+ ]);
+ $table->addColumn('class', Type::STRING, [
+ 'notnull' => true,
+ 'length' => 255,
+ ]);
+ $table->addColumn('priority', Type::INTEGER, [
+ 'notnull' => true,
+ 'length' => 6,
+ 'default' => 0,
+ ]);
+
+ $table->setPrimaryKey(['id'], 'personal_sections_id_index');
+ $table->addUniqueIndex(['class'], 'personal_sections_class');
+ }
+
+ if (!$schema->hasTable('personal_settings')) {
+ $table = $schema->createTable('personal_settings');
+
+ $table->addColumn('id', Type::INTEGER, [
+ 'autoincrement' => true,
+ 'notnull' => true,
+ 'length' => 20,
+ ]);
+ $table->addColumn('class', Type::STRING, [
+ 'notnull' => true,
+ 'length' => 255,
+ ]);
+ $table->addColumn('section', Type::STRING, [
+ 'notnull' => false,
+ 'length' => 64,
+ ]);
+ $table->addColumn('priority', Type::INTEGER, [
+ 'notnull' => true,
+ 'length' => 6,
+ 'default' => 0,
+ ]);
+
+ $table->setPrimaryKey(['id'], 'personal_settings_id_index');
+ $table->addUniqueIndex(['class'], 'personal_settings_class');
+ $table->addIndex(['section'], 'personal_settings_section');
+ }
+
+ return $schema;
+ }
+}
diff --git a/lib/private/DB/MigrationService.php b/lib/private/DB/MigrationService.php
index 70f81d9c808..a4276b08c12 100644
--- a/lib/private/DB/MigrationService.php
+++ b/lib/private/DB/MigrationService.php
@@ -69,7 +69,7 @@ class MigrationService {
if ($appName === 'core') {
$this->migrationsPath = \OC::$SERVERROOT . '/core/Migrations';
- $this->migrationsNamespace = 'OC\\Migrations';
+ $this->migrationsNamespace = 'OC\\Core\\Migrations';
} else {
if (null === $appLocator) {
$appLocator = new AppLocator();
diff --git a/lib/private/Updater.php b/lib/private/Updater.php
index 464344d2209..6c23a43c354 100644
--- a/lib/private/Updater.php
+++ b/lib/private/Updater.php
@@ -302,10 +302,8 @@ class Updater extends BasicEmitter {
$this->emit('\OC\Updater', 'dbUpgradeBefore');
// execute core migrations
- if (is_dir(\OC::$SERVERROOT . '/core/Migrations')) {
- $ms = new MigrationService('core', \OC::$server->getDatabaseConnection());
- $ms->migrate();
- }
+ $ms = new MigrationService('core', \OC::$server->getDatabaseConnection());
+ $ms->migrate();
$this->emit('\OC\Updater', 'dbUpgrade');
}
--
GitLab