Merge pull request #434 from nextcloud/techdebt/noid/move-to-migrations

Move to migrations

3 files changed, 92 insertions, 82 deletions

diff --git a/appinfo/database.xml b/appinfo/database.xml
deleted file mode 100644
index d693d37a..00000000
--- a/appinfo/database.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<database>
-
-	<name>*dbname*</name>
-	<create>true</create>
-	<overwrite>false</overwrite>
-	<charset>utf8</charset>
-
-	<table>
-		<name>*dbprefix*user_saml_users</name>
-		<declaration>
-			<field>
-				<name>uid</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<primary>true</primary>
-				<length>64</length>
-			</field>
-
-			<field>
-				<name>displayname</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>255</length>
-			</field>
-
-			<field>
-				<name>home</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>255</length>
-			</field>
-
-		</declaration>
-	</table>
-
-	<table>
-		<!-- Copied table from core: Nextcloud 9 does not support application
-		specific passwords and so we -->
-		<name>*dbprefix*user_saml_auth_token</name>
-
-		<declaration>
-			<field>
-				<name>id</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<autoincrement>1</autoincrement>
-				<unsigned>true</unsigned>
-				<length>4</length>
-			</field>
-
-			<!-- Foreign Key users::uid -->
-			<field>
-				<name>uid</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-
-			<field>
-				<name>name</name>
-				<type>clob</type>
-				<default></default>
-				<notnull>true</notnull>
-			</field>
-
-			<field>
-				<name>token</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>200</length>
-			</field>
-		</declaration>
-	</table>
-</database>
diff --git a/appinfo/info.xml b/appinfo/info.xml
index cf686f19..2546b355 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -16,7 +16,7 @@ The following providers are supported and tested at the moment:
 	* Any other provider that authenticates using the environment variable
 
 While theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.]]></description>
-	<version>3.1.0</version>
+	<version>3.1.1</version>
 	<licence>agpl</licence>
 	<author>Lukas Reschke</author>
 	<namespace>User_SAML</namespace>
diff --git a/lib/Migration/Version3001Date20200630193443.php b/lib/Migration/Version3001Date20200630193443.php
new file mode 100644
index 00000000..de709be5
--- /dev/null
+++ b/lib/Migration/Version3001Date20200630193443.php
@@ -0,0 +1,91 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2020 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 OCA\User_SAML\Migration;
+
+use Closure;
+use Doctrine\DBAL\Types\Type;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version3001Date20200630193443 extends SimpleMigrationStep {
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		if (!$schema->hasTable('user_saml_users')) {
+			$table = $schema->createTable('user_saml_users');
+			$table->addColumn('uid', Type::STRING, [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('displayname', Type::STRING, [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->addColumn('home', Type::STRING, [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->setPrimaryKey(['uid']);
+		}
+
+		if (!$schema->hasTable('user_saml_auth_token')) {
+			$table = $schema->createTable('user_saml_auth_token');
+			$table->addColumn('id', Type::INTEGER, [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 4,
+				'unsigned' => true,
+			]);
+			$table->addColumn('uid', Type::STRING, [
+				'notnull' => true,
+				'length' => 64,
+				'default' => '',
+			]);
+			$table->addColumn('name', Type::TEXT, [
+				'notnull' => true,
+				'default' => '',
+			]);
+			$table->addColumn('token', Type::STRING, [
+				'notnull' => true,
+				'length' => 200,
+				'default' => '',
+			]);
+			$table->setPrimaryKey(['id']);
+		}
+		return $schema;
+	}
+}