Merge pull request #21639 from nextcloud/techdebt/noid/move-away-from-database-xml

Move away from database xml

5 files changed, 104 insertions, 148 deletions

diff --git a/apps/user_ldap/appinfo/database.xml b/apps/user_ldap/appinfo/database.xml
deleted file mode 100644
index 4875a70f852..00000000000
--- a/apps/user_ldap/appinfo/database.xml
+++ /dev/null
@@ -1,147 +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*ldap_user_mapping</name>
-
-  <declaration>
-
-   <field>
-    <name>ldap_dn</name>
-    <type>text</type>
-    <notnull>true</notnull>
-	<length>255</length>
-	<default></default>
-   </field>
-
-   <field>
-    <name>owncloud_name</name>
-    <type>text</type>
-    <notnull>true</notnull>
-    <length>255</length>
-	<default></default>
-   </field>
-
-   <field>
-    <name>directory_uuid</name>
-    <type>text</type>
-    <notnull>true</notnull>
-    <length>255</length>
-	<default></default>
-   </field>
-
-   <index>
-    <name>ldap_dn_users</name>
-    <unique>true</unique>
-    <field>
-     <name>ldap_dn</name>
-    </field>
-   </index>
-
-   <index>
-    <name>owncloud_name_users</name>
-	   <primary>true</primary>
-    <unique>true</unique>
-    <field>
-     <name>owncloud_name</name>
-	 <sorting>ascending</sorting>
-    </field>
-   </index>
-
-  </declaration>
-
- </table>
-
- <table>
-
-  <name>*dbprefix*ldap_group_mapping</name>
-
-  <declaration>
-
-   <field>
-    <name>ldap_dn</name>
-    <type>text</type>
-    <notnull>true</notnull>
-    <length>255</length>
-    <default></default>
-   </field>
-
-   <field>
-    <name>owncloud_name</name>
-    <type>text</type>
-    <notnull>true</notnull>
-    <length>255</length>
-    <default></default>
-   </field>
-
-   <field>
-    <name>directory_uuid</name>
-    <type>text</type>
-    <notnull>true</notnull>
-    <length>255</length>
-	<default></default>
-   </field>
-
-   <index>
-    <name>ldap_dn_groups</name>
-    <unique>true</unique>
-	   <primary>true</primary>
-    <field>
-     <name>ldap_dn</name>
-    </field>
-   </index>
-
-   <index>
-    <name>owncloud_name_groups</name>
-    <unique>true</unique>
-    <field>
-     <name>owncloud_name</name>
-     <sorting>ascending</sorting>
-    </field>
-   </index>
-
-  </declaration>
-
- </table>
-
-
- <table>
-
-  <name>*dbprefix*ldap_group_members</name>
-
-  <declaration>
-
-   <field>
-    <name>owncloudname</name>
-    <type>text</type>
-    <notnull>true</notnull>
-    <length>255</length>
-    <default></default>
-   </field>
-
-   <field>
-    <name>owncloudusers</name>
-    <type>clob</type>
-    <notnull>true</notnull>
-   </field>
-
-   <index>
-    <name>ldap_group_members_index</name>
-    <unique>true</unique>
-	   <primary>true</primary>
-    <field>
-     <name>owncloudname</name>
-    </field>
-   </index>
-
-  </declaration>
-
- </table>
-
-</database>
diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index f59d4c3a3ac..7a44f7f654c 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -9,7 +9,7 @@
 A user logs into Nextcloud with their LDAP or AD credentials, and is granted access based on an authentication request handled by the LDAP or AD server. Nextcloud does not store LDAP or AD passwords, rather these credentials are used to authenticate a user and then Nextcloud uses a session for the user ID. More information is available in the LDAP User and Group Backend documentation.
 
 	</description>
-	<version>1.10.0</version>
+	<version>1.10.1</version>
 	<licence>agpl</licence>
 	<author>Dominik Schmidt</author>
 	<author>Arthur Schiwon</author>
diff --git a/apps/user_ldap/composer/composer/autoload_classmap.php b/apps/user_ldap/composer/composer/autoload_classmap.php
index 3b08f3f7f3e..2190b24688e 100644
--- a/apps/user_ldap/composer/composer/autoload_classmap.php
+++ b/apps/user_ldap/composer/composer/autoload_classmap.php
@@ -52,6 +52,7 @@ return array(
     'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => $baseDir . '/../lib/Migration/UUIDFixGroup.php',
     'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => $baseDir . '/../lib/Migration/UUIDFixInsert.php',
     'OCA\\User_LDAP\\Migration\\UUIDFixUser' => $baseDir . '/../lib/Migration/UUIDFixUser.php',
+    'OCA\\User_LDAP\\Migration\\Version1010Date20200630192842' => $baseDir . '/../lib/Migration/Version1010Date20200630192842.php',
     'OCA\\User_LDAP\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',
     'OCA\\User_LDAP\\PagedResults\\IAdapter' => $baseDir . '/../lib/PagedResults/IAdapter.php',
     'OCA\\User_LDAP\\PagedResults\\Php54' => $baseDir . '/../lib/PagedResults/Php54.php',
diff --git a/apps/user_ldap/composer/composer/autoload_static.php b/apps/user_ldap/composer/composer/autoload_static.php
index 97080049d51..2f77aebad31 100644
--- a/apps/user_ldap/composer/composer/autoload_static.php
+++ b/apps/user_ldap/composer/composer/autoload_static.php
@@ -67,6 +67,7 @@ class ComposerStaticInitUser_LDAP
         'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => __DIR__ . '/..' . '/../lib/Migration/UUIDFixGroup.php',
         'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => __DIR__ . '/..' . '/../lib/Migration/UUIDFixInsert.php',
         'OCA\\User_LDAP\\Migration\\UUIDFixUser' => __DIR__ . '/..' . '/../lib/Migration/UUIDFixUser.php',
+        'OCA\\User_LDAP\\Migration\\Version1010Date20200630192842' => __DIR__ . '/..' . '/../lib/Migration/Version1010Date20200630192842.php',
         'OCA\\User_LDAP\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',
         'OCA\\User_LDAP\\PagedResults\\IAdapter' => __DIR__ . '/..' . '/../lib/PagedResults/IAdapter.php',
         'OCA\\User_LDAP\\PagedResults\\Php54' => __DIR__ . '/..' . '/../lib/PagedResults/Php54.php',
diff --git a/apps/user_ldap/lib/Migration/Version1010Date20200630192842.php b/apps/user_ldap/lib/Migration/Version1010Date20200630192842.php
new file mode 100644
index 00000000000..71617c41a18
--- /dev/null
+++ b/apps/user_ldap/lib/Migration/Version1010Date20200630192842.php
@@ -0,0 +1,101 @@
+<?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_LDAP\Migration;
+
+use Closure;
+use Doctrine\DBAL\Types\Types;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version1010Date20200630192842 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('ldap_user_mapping')) {
+			$table = $schema->createTable('ldap_user_mapping');
+			$table->addColumn('ldap_dn', Types::STRING, [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->addColumn('owncloud_name', Types::STRING, [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->addColumn('directory_uuid', Types::STRING, [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->setPrimaryKey(['owncloud_name']);
+			$table->addUniqueIndex(['ldap_dn'], 'ldap_dn_users');
+		}
+
+		if (!$schema->hasTable('ldap_group_mapping')) {
+			$table = $schema->createTable('ldap_group_mapping');
+			$table->addColumn('ldap_dn', Types::STRING, [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->addColumn('owncloud_name', Types::STRING, [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->addColumn('directory_uuid', Types::STRING, [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->setPrimaryKey(['ldap_dn']);
+			$table->addUniqueIndex(['owncloud_name'], 'owncloud_name_groups');
+		}
+
+		if (!$schema->hasTable('ldap_group_members')) {
+			$table = $schema->createTable('ldap_group_members');
+			$table->addColumn('owncloudname', Types::STRING, [
+				'notnull' => true,
+				'length' => 255,
+				'default' => '',
+			]);
+			$table->addColumn('owncloudusers', Types::TEXT, [
+				'notnull' => true,
+			]);
+			$table->setPrimaryKey(['owncloudname']);
+		}
+		return $schema;
+	}
+}