Merge pull request #217 from nextcloud/bugfix/207/revert-and-switch-to-text

varchar->text

lib/Db/CacheActorsRequest.php

@@ -64,11 +64,6 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
 	 * @param Person $actor
 	 */
 	public function save(Person $actor) {
-		$source = $actor->getSource();
-		if (strlen($source) >= CoreRequestBuilder::SOURCE_LENGTH) {
-			$source = 'too_big';
-		}
-
 		$qb = $this->getCacheActorsInsertSql();
 		$qb->setValue('id', $qb->createNamedParameter($actor->getId()))
 		   ->setValue('account', $qb->createNamedParameter($actor->getAccount()))
@@ -87,7 +82,7 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
 		   ->setValue('name', $qb->createNamedParameter($actor->getName()))
 		   ->setValue('summary', $qb->createNamedParameter($actor->getSummary()))
 		   ->setValue('public_key', $qb->createNamedParameter($actor->getPublicKey()))
-		   ->setValue('source', $qb->createNamedParameter($source))
+		   ->setValue('source', $qb->createNamedParameter($actor->getSource()))
 		   ->setValue('details', $qb->createNamedParameter(json_encode($actor->getDetails())))
 		   ->setValue(
 			   'creation',

lib/Db/CoreRequestBuilder.php

@@ -63,10 +63,7 @@ class CoreRequestBuilder {
 	const TABLE_CACHE_ACTORS = 'social_cache_actors';
 	const TABLE_CACHE_DOCUMENTS = 'social_cache_documents';
 
-
-	const SOURCE_LENGTH = 10000;
-
-
+	
 	/** @var IDBConnection */
 	protected $dbConnection;
 

lib/Db/NotesRequest.php

@@ -66,11 +66,6 @@ class NotesRequest extends NotesRequestBuilder {
 		$dTime = new DateTime();
 		$dTime->setTimestamp($note->getPublishedTime());
 
-		$source = $note->getSource();
-		if (strlen($source) >= CoreRequestBuilder::SOURCE_LENGTH) {
-			$source = 'too_big';
-		}
-
 		$qb = $this->getNotesInsertSql();
 		$qb->setValue('id', $qb->createNamedParameter($note->getId()))
 		   ->setValue('type', $qb->createNamedParameter($note->getType()))
@@ -98,7 +93,7 @@ class NotesRequest extends NotesRequestBuilder {
 		   )
 		   ->setValue('attributed_to', $qb->createNamedParameter($note->getAttributedTo()))
 		   ->setValue('in_reply_to', $qb->createNamedParameter($note->getInReplyTo()))
-		   ->setValue('source', $qb->createNamedParameter($source))
+		   ->setValue('source', $qb->createNamedParameter($note->getSource()))
 		   ->setValue(
 			   'instances', $qb->createNamedParameter(
 			   json_encode($note->getInstancePaths(), JSON_UNESCAPED_SLASHES)

lib/Migration/Version0001Date20181204203147.php

@@ -318,7 +318,7 @@ class Version0001Date20181204203147 extends SimpleMigrationStep {
 			]);
 			$table->addColumn('author', 'string', [
 				'notnull' => true,
-				'length' => 1270,
+				'length' => 127,
 			]);
 			$table->addColumn('activity', 'string', [
 				'notnull' => true,

lib/Migration/Version0001Date20181219000001.php

@@ -0,0 +1,133 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.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\Social\Migration;
+
+
+use Closure;
+use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\DBAL\Types\Type;
+use OCA\Social\Db\CoreRequestBuilder;
+use OCP\DB\ISchemaWrapper;
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+
+/**
+ * Class Version0001Date20181219000001
+ *
+ * @package OCA\Social\Migration
+ */
+class Version0001Date20181219000001 extends SimpleMigrationStep {
+
+
+	/** @var IDBConnection */
+	private $connection;
+
+
+	/** @var array */
+	public static $editToText = [
+		[CoreRequestBuilder::TABLE_CACHE_ACTORS, 'source'],
+		[CoreRequestBuilder::TABLE_CACHE_ACTORS, 'summary'],
+		[CoreRequestBuilder::TABLE_CACHE_ACTORS, 'details'],
+		[CoreRequestBuilder::TABLE_REQUEST_QUEUE, 'activity'],
+		[CoreRequestBuilder::TABLE_SERVER_ACTORS, 'summary'],
+		[CoreRequestBuilder::TABLE_SERVER_NOTES, 'content'],
+		[CoreRequestBuilder::TABLE_SERVER_NOTES, 'summary'],
+		[CoreRequestBuilder::TABLE_SERVER_NOTES, 'instances'],
+		[CoreRequestBuilder::TABLE_SERVER_NOTES, 'source']
+	];
+
+	/** @var array */
+	public static $editToChar4000 = [
+		[CoreRequestBuilder::TABLE_SERVER_NOTES, 'to_array'],
+		[CoreRequestBuilder::TABLE_SERVER_NOTES, 'cc'],
+		[CoreRequestBuilder::TABLE_SERVER_NOTES, 'bcc']
+	];
+
+
+	/**
+	 * @param IDBConnection $connection
+	 */
+	public function __construct(IDBConnection $connection) {
+		$this->connection = $connection;
+	}
+
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 *
+	 * @return ISchemaWrapper
+	 * @throws SchemaException
+	 * @throws DBALException
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options
+	): ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		foreach (array_merge(self::$editToText, self::$editToChar4000) as $edit) {
+			list($tableName, $field) = $edit;
+
+			$table = $schema->getTable($tableName);
+			if ($table->hasColumn($field . '_copy')) {
+				continue;
+			}
+
+			$table->addColumn($field . '_copy', Type::TEXT, ['notnull' => false]);
+		}
+
+		return $schema;
+	}
+
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 */
+	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
+
+		foreach (array_merge(self::$editToText, self::$editToChar4000) as $edit) {
+			list($tableName, $field) = $edit;
+
+			$qb = $this->connection->getQueryBuilder();
+			$qb->update($tableName)
+			   ->set($field . '_copy', $field)
+			   ->execute();
+		}
+	}
+
+}
+

lib/Migration/Version0001Date20181219000002.php

@@ -32,18 +32,22 @@ namespace OCA\Social\Migration;
 
 
 use Closure;
+use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\DBAL\Types\Type;
 use OCA\Social\Db\CoreRequestBuilder;
 use OCP\DB\ISchemaWrapper;
+use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
 
 
 /**
- * Class Version0001Date20181208185242
+ * Class Version0001Date20181219000002
  *
  * @package OCA\Social\Migration
  */
-class Version0001Date20181208185242 extends SimpleMigrationStep {
+class Version0001Date20181219000002 extends SimpleMigrationStep {
 
 
 	/**
@@ -52,37 +56,28 @@ class Version0001Date20181208185242 extends SimpleMigrationStep {
 	 * @param array $options
 	 *
 	 * @return ISchemaWrapper
-	 * @throws \Doctrine\DBAL\Schema\SchemaException
+	 * @throws SchemaException
 	 */
 	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options
 	): ISchemaWrapper {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
 
-		$table = $schema->getTable(CoreRequestBuilder::TABLE_CACHE_ACTORS);
-		$table->changeColumn(
-			'source', [
-						'notnull' => true,
-						'length'  => CoreRequestBuilder::SOURCE_LENGTH,
-					]
+		$edits = array_merge(
+			Version0001Date20181219000001::$editToText,
+			Version0001Date20181219000001::$editToChar4000
 		);
+		foreach ($edits as $edit) {
+			list($tableName, $field) = $edit;
 
-		$table = $schema->getTable(CoreRequestBuilder::TABLE_SERVER_NOTES);
-		$table->changeColumn(
-			'source', [
-						'notnull' => true,
-						'length'  => CoreRequestBuilder::SOURCE_LENGTH,
-					]
-		);
-
-		$table = $schema->getTable(CoreRequestBuilder::TABLE_REQUEST_QUEUE);
-		$table->changeColumn(
-			'activity', [
-						  'notnull' => true,
-						  'length'  => CoreRequestBuilder::SOURCE_LENGTH,
-					  ]
-		);
+			$table = $schema->getTable($tableName);
+			if ($table->hasColumn($field) && $table->hasColumn($field . '_copy')) {
+				$table->dropColumn($field);
+			}
+		}
 
 		return $schema;
 	}
+
 }
+

lib/Migration/Version0001Date20181219000003.php

@@ -0,0 +1,128 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.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\Social\Migration;
+
+
+use Closure;
+use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\DBAL\Types\Type;
+use OCP\DB\ISchemaWrapper;
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+
+/**
+ * Class Version0001Date20181219000003
+ *
+ * @package OCA\Social\Migration
+ */
+class Version0001Date20181219000003 extends SimpleMigrationStep {
+
+
+	/** @var IDBConnection */
+	private $connection;
+
+
+	/**
+	 * @param IDBConnection $connection
+	 */
+	public function __construct(IDBConnection $connection) {
+		$this->connection = $connection;
+	}
+
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 *
+	 * @return ISchemaWrapper
+	 * @throws SchemaException
+	 * @throws DBALException
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options
+	): ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		// -> TEXT
+		foreach (Version0001Date20181219000001::$editToText as $edit) {
+			list($tableName, $field) = $edit;
+
+			$table = $schema->getTable($tableName);
+			if ($table->hasColumn($field)) {
+				continue;
+			}
+
+			$table->addColumn($field, Type::TEXT, ['notnull' => false]);
+		}
+
+		// -> VARCHAR(4000)
+		foreach (Version0001Date20181219000001::$editToChar4000 as $edit) {
+			list($tableName, $field) = $edit;
+
+			$table = $schema->getTable($tableName);
+			if ($table->hasColumn($field)) {
+				continue;
+			}
+
+			$table->addColumn($field, Type::STRING, ['notnull' => false, 'length' => 4000]);
+		}
+
+		return $schema;
+	}
+
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 */
+	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
+
+		$edits = array_merge(
+			Version0001Date20181219000001::$editToText,
+			Version0001Date20181219000001::$editToChar4000
+		);
+		foreach ($edits as $edit) {
+			list($table, $field) = $edit;
+
+			$qb = $this->connection->getQueryBuilder();
+			$qb->update($table)
+			   ->set($field, $field . '_copy')
+			   ->execute();
+		}
+	}
+
+}
+

lib/Migration/Version0001Date20181219000004.php

@@ -0,0 +1,83 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.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\Social\Migration;
+
+
+use Closure;
+use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\DBAL\Types\Type;
+use OCP\DB\ISchemaWrapper;
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+
+/**
+ * Class Version0001Date20181219000004
+ *
+ * @package OCA\Social\Migration
+ */
+class Version0001Date20181219000004 extends SimpleMigrationStep {
+
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 *
+	 * @return ISchemaWrapper
+	 * @throws SchemaException
+	 * @throws DBALException
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options
+	): ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		$edits = array_merge(
+			Version0001Date20181219000001::$editToText,
+			Version0001Date20181219000001::$editToChar4000
+		);
+		foreach ($edits as $edit) {
+			list($tableName, $field) = $edit;
+
+			$table = $schema->getTable($tableName);
+			if ($table->hasColumn($field) && $table->hasColumn($field . '_copy')) {
+				$table->dropColumn($field . '_copy');
+			}
+		}
+
+		return $schema;
+	}
+
+}
+