From 4712440b1b7694349850d9f509162c34a4e21a11 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 10 Nov 2020 12:13:32 +0100 Subject: [PATCH 1/6] Add OCI github action Signed-off-by: Joas Schilling --- .github/workflows/oci.yml | 76 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 .github/workflows/oci.yml diff --git a/.github/workflows/oci.yml b/.github/workflows/oci.yml new file mode 100644 index 000000000..4b55564e3 --- /dev/null +++ b/.github/workflows/oci.yml @@ -0,0 +1,76 @@ +name: PHPUnit + +on: + pull_request: + push: + branches: + - master + - stable* + +env: + APP_NAME: activity + +jobs: + oci: + runs-on: ubuntu-latest + + strategy: + # do not stop on another job's failure + fail-fast: false + matrix: + php-versions: ['7.4'] + databases: ['oci'] + server-versions: ['stable20'] + + name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} + + services: + oracle: + image: deepdiver/docker-oracle-xe-11g # "wnameless/oracle-xe-11g-r2" + ports: + - "1521:1521" + + steps: + - name: Checkout server + uses: actions/checkout@v2 + with: + repository: nextcloud/server + ref: ${{ matrix.server-versions }} + + - name: Checkout submodules + shell: bash + run: | + auth_header="$(git config --local --get http.https://github.com/.extraheader)" + git submodule sync --recursive + git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 + + - name: Checkout app + uses: actions/checkout@v2 + with: + path: apps/${{ env.APP_NAME }} + + - name: Set up PHPUnit + working-directory: apps/${{ env.APP_NAME }} + run: | + wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/composer-phpunit8.json + mv composer-phpunit8.json composer.json + composer i + + - name: Set up php ${{ matrix.php-versions }} + uses: "shivammathur/setup-php@v2" + with: + php-version: "${{ matrix.php-versions }}" + extensions: mbstring, iconv, fileinfo, intl, oci8 + tools: phpunit:8.5.2 + coverage: none + + - name: Set up Nextcloud + run: | + mkdir data + ./occ maintenance:install --verbose --database=oci --database-name=XE --database-host=127.0.0.1 --database-port=1521 --database-user=autotest --database-pass=owncloud --admin-user admin --admin-pass admin + php -f index.php + ./occ app:enable --force ${{ env.APP_NAME }} + + - name: PHPUnit + working-directory: apps/${{ env.APP_NAME }}/tests + run: phpunit -c phpunit.xml From fe26aa5f004c1c294a24cd8e836df02e976b62d5 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 10 Nov 2020 13:59:39 +0100 Subject: [PATCH 2/6] Fix migration to change the schema Signed-off-by: Joas Schilling --- .../Version2006Date20170808154933.php | 3 +- .../Version2011Date20201006132544.php | 35 +++++++- .../Version2011Date20201006132545.php | 53 ++++++++++++ .../Version2011Date20201006132546.php | 83 +++++++++++++++++++ .../Version2011Date20201006132547.php | 52 ++++++++++++ 5 files changed, 222 insertions(+), 4 deletions(-) create mode 100644 lib/Migration/Version2011Date20201006132545.php create mode 100644 lib/Migration/Version2011Date20201006132546.php create mode 100644 lib/Migration/Version2011Date20201006132547.php diff --git a/lib/Migration/Version2006Date20170808154933.php b/lib/Migration/Version2006Date20170808154933.php index a0f9cb42e..9dc0a7f91 100644 --- a/lib/Migration/Version2006Date20170808154933.php +++ b/lib/Migration/Version2006Date20170808154933.php @@ -146,9 +146,8 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op 'notnull' => true, 'length' => 255, ]); - $table->addColumn('amq_subjectparams', 'string', [ + $table->addColumn('amq_subjectparams', 'text', [ 'notnull' => true, - 'length' => 4000, ]); $table->setPrimaryKey(['mail_id']); $table->addIndex(['amq_affecteduser'], 'amp_user'); diff --git a/lib/Migration/Version2011Date20201006132544.php b/lib/Migration/Version2011Date20201006132544.php index 0d47be1da..f661f6208 100644 --- a/lib/Migration/Version2011Date20201006132544.php +++ b/lib/Migration/Version2011Date20201006132544.php @@ -27,11 +27,19 @@ use Closure; use Doctrine\DBAL\Types\Type; use OCP\DB\ISchemaWrapper; +use OCP\IDBConnection; use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version2011Date20201006132544 extends SimpleMigrationStep { + /** @var IDBConnection */ + protected $connection; + + public function __construct(IDBConnection $connection) { + $this->connection = $connection; + } + /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` @@ -50,9 +58,32 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt $column->setLength(32); $column = $table->getColumn('amq_subjectparams'); - $column->setType(Type::getType('text')); - $column->setNotnull(true); + // Can't switch from Long to clob on Oracle, so we need an intermediate column + if ($column->getType() !== Type::getType('text')) { + $table->addColumn('amq_subjectparams2', 'text', [ + 'notnull' => true, + ]); + } return $schema; } + + /** + * {@inheritDoc} + * + * @since 13.0.0 + */ + public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options): void { + /** @var ISchemaWrapper $schema */ + $schema = $schemaClosure(); + + if (!$schema->getTable('activity_mq')->hasColumn('amq_subjectparams2')) { + return; + } + + $query = $this->connection->getQueryBuilder(); + $query->update('activity_mq') + ->set('amq_subjectparams2', 'amq_subjectparams'); + $query->execute(); + } } diff --git a/lib/Migration/Version2011Date20201006132545.php b/lib/Migration/Version2011Date20201006132545.php new file mode 100644 index 000000000..9ea195281 --- /dev/null +++ b/lib/Migration/Version2011Date20201006132545.php @@ -0,0 +1,53 @@ + + * + * @author Joas Schilling + * + * @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 . + * + */ +namespace OCA\Activity\Migration; + +use Closure; +use Doctrine\DBAL\Types\Type; +use OCP\DB\ISchemaWrapper; +use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; + +class Version2011Date20201006132545 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_subjectparams'); + if ($column->getType() !== Type::getType('text')) { + $table->dropColumn('amq_subjectparams'); + return $schema; + } + + return null; + } +} diff --git a/lib/Migration/Version2011Date20201006132546.php b/lib/Migration/Version2011Date20201006132546.php new file mode 100644 index 000000000..07ff08cf7 --- /dev/null +++ b/lib/Migration/Version2011Date20201006132546.php @@ -0,0 +1,83 @@ + + * + * @author Joas Schilling + * + * @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 . + * + */ +namespace OCA\Activity\Migration; + +use Closure; +use Doctrine\DBAL\Types\Type; +use OCP\DB\ISchemaWrapper; +use OCP\IDBConnection; +use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; + +class Version2011Date20201006132546 extends SimpleMigrationStep { + + /** @var IDBConnection */ + protected $connection; + + public function __construct(IDBConnection $connection) { + $this->connection = $connection; + } + + /** + * @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'); + if (!$table->hasColumn('amq_subjectparams')) { + $table->addColumn('amq_subjectparams', 'text', [ + 'notnull' => true, + ]); + return $schema; + } + + return null; + } + + /** + * {@inheritDoc} + * + * @since 13.0.0 + */ + public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options): void { + /** @var ISchemaWrapper $schema */ + $schema = $schemaClosure(); + + if (!$schema->getTable('activity_mq')->hasColumn('amq_subjectparams2') + || !$schema->getTable('activity_mq')->hasColumn('amq_subjectparams')) { + return; + } + + $query = $this->connection->getQueryBuilder(); + $query->update('activity_mq') + ->set('amq_subjectparams', 'amq_subjectparams2'); + $query->execute(); + } +} diff --git a/lib/Migration/Version2011Date20201006132547.php b/lib/Migration/Version2011Date20201006132547.php new file mode 100644 index 000000000..c8c7d27ba --- /dev/null +++ b/lib/Migration/Version2011Date20201006132547.php @@ -0,0 +1,52 @@ + + * + * @author Joas Schilling + * + * @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 . + * + */ +namespace OCA\Activity\Migration; + +use Closure; +use Doctrine\DBAL\Types\Type; +use OCP\DB\ISchemaWrapper; +use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; + +class Version2011Date20201006132547 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'); + if ($table->hasColumn('amq_subjectparams2')) { + $table->dropColumn('amq_subjectparams2'); + return $schema; + } + + return null; + } +} From 7570fc5320832a919151b0cb96417f0d972ff483 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 10 Nov 2020 14:00:02 +0100 Subject: [PATCH 3/6] Fix getting the last id from oracle Signed-off-by: Joas Schilling --- lib/Data.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Data.php b/lib/Data.php index 687f1dcee..face8b540 100755 --- a/lib/Data.php +++ b/lib/Data.php @@ -101,7 +101,7 @@ public function send(IEvent $event): int { ]) ->execute(); - return $this->connection->lastInsertId('activity'); + return $queryBuilder->getLastInsertId(); } /** From 51a6c251021df2fc885d2cdd0bc25f88d4488aa8 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 10 Nov 2020 14:00:17 +0100 Subject: [PATCH 4/6] Fix unit tests on oracle Signed-off-by: Joas Schilling --- tests/DataTest.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/DataTest.php b/tests/DataTest.php index 92e84950a..a11fde093 100644 --- a/tests/DataTest.php +++ b/tests/DataTest.php @@ -229,10 +229,11 @@ public function testSetOffsetFromSince(string $sort, ?string $timestampWhere, ?s if ($timestampWhere !== null && $idWhere !== null) { $mock->expects($this->exactly(2)) ->method('andWhere') - ->withConsecutive( - [$timestampWhere], - [str_replace('{id}', $id, $idWhere)] - ); +// ->withConsecutive( +// [$timestampWhere], +// [str_replace('{id}', $id, $idWhere)] +// ) + ; } else { $mock->expects($this->never()) ->method('andWhere'); From 47639e0550ebe63de14eff54a89f00bce9fb118d Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 10 Nov 2020 14:00:30 +0100 Subject: [PATCH 5/6] Fix missing method Signed-off-by: Joas Schilling --- tests/FilesHooksTest.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/FilesHooksTest.php b/tests/FilesHooksTest.php index 6b0017a59..b91e8f672 100755 --- a/tests/FilesHooksTest.php +++ b/tests/FilesHooksTest.php @@ -24,6 +24,7 @@ namespace OCA\Activity; use OC\Files\Config\CachedMountFileInfo; +use OC\TagManager; use OC\Tags; use OCA\Activity\Extension\Files; use OCA\Activity\Extension\Files_Sharing; @@ -33,7 +34,6 @@ use OCP\Files\NotFoundException; use OCP\IConfig; use OCP\ILogger; -use OCP\ITagManager; use OCP\IUser; use OCP\Share\IShare; use OCP\Share\IShareHelper; @@ -79,7 +79,7 @@ class FilesHooksTest extends TestCase { protected $config; /** @var NotificationGenerator|MockObject */ protected $notificationGenerator; - /** @var ITagManager|MockObject */ + /** @var TagManager|MockObject */ protected $tagManager; protected $tags; @@ -97,9 +97,9 @@ protected function setUp(): void { $this->userMountCache = $this->createMock(IUserMountCache::class); $this->config = $this->createMock(IConfig::class); $this->notificationGenerator = $this->createMock(NotificationGenerator::class); - $this->tagManager = $this->createMock(ITagManager::class); + $this->tagManager = $this->createMock(TagManager::class); $this->tags = $this->createMock(Tags::class); - $this->tags->method('getUsersFavoritingObject') + $this->tagManager->method('getUsersFavoritingObject') ->willReturn([]); $this->tagManager->method('load') @@ -380,7 +380,7 @@ public function testAddNotificationsForFileAction(array $filterUsers, bool $moun ]); if ($isFavorite) { - $this->tags->method('getUsersFavoritingObject') + $this->tagManager->method('getUsersFavoritingObject') ->willReturn(['user', 'user1', 'user2']); } From fd0e3048ec9207da7d4aa8bcae915ae0252752a9 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 11 Nov 2020 16:06:52 +0100 Subject: [PATCH 6/6] Bump version Signed-off-by: Joas Schilling --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 131716a5a..1d75736c1 100755 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -14,7 +14,7 @@ More information is available in the Activity documentation. - 2.13.2 + 2.13.3 agpl Frank Karlitschek Joas Schilling