Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable18] Fix mail table columns to match the activity table #513

Merged
merged 3 commits into from
Oct 8, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
More information is available in the Activity documentation.
</description>

<version>2.11.0</version>
<version>2.11.1</version>
<licence>agpl</licence>
<author>Frank Karlitschek</author>
<author>Joas Schilling</author>
58 changes: 58 additions & 0 deletions lib/Migration/Version2011Date20201006132544.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?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\Activity\Migration;

use Closure;
use Doctrine\DBAL\Types\Type;
use OCP\DB\ISchemaWrapper;
use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;

class Version2011Date20201006132544 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();

$table = $schema->getTable('activity_mq');

$column = $table->getColumn('amq_appid');
$column->setType(Type::getType('string'));
$column->setNotnull(true);
$column->setLength(32);

$column = $table->getColumn('amq_subjectparams');
$column->setType(Type::getType('text'));
$column->setNotnull(true);

return $schema;
}
}
4 changes: 2 additions & 2 deletions tests/MailQueueHandlerTest.php
Original file line number Diff line number Diff line change
@@ -83,7 +83,7 @@ class MailQueueHandlerTest extends TestCase {
protected function setUp(): void {
parent::setUp();

$app = self::getUniqueID('MailQueueHandlerTest');
$app = self::getUniqueID('MailQueueHandlerTest', 10);
$this->userManager = $this->createMock(IUserManager::class);
$this->lFactory = $this->createMock(IFactory::class);
$this->config = $this->createMock(IConfig::class);
@@ -219,7 +219,7 @@ public function testGetItemsForUser() {
. ' (`amq_appid`, `amq_subject`, `amq_subjectparams`, `amq_affecteduser`, `amq_timestamp`, `amq_type`, `amq_latest_send`) '
. ' VALUES(?, ?, ?, ?, ?, ?, ?)');

$app = self::getUniqueID('MailQueueHandlerTest');
$app = self::getUniqueID('MailQueueHandlerTest', 10);
for ($i = 0; $i < 15; $i++) {
$query->execute(array($app, 'Test data', 'Param1', 'user1', 150, 'phpunit', 160 + $i));
}