Merge pull request #978 from nextcloud/backport/900/900-stable23

[stable23] oracle support

.github/workflows/phpunit.yml

@@ -200,3 +200,64 @@ jobs:
       # - name: PHPUnit integration
       #   working-directory: apps/${{ env.APP_NAME }}
       #   run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml
+
+  oci:
+    runs-on: ubuntu-latest
+
+    strategy:
+      # do not stop on another job's failure
+      fail-fast: false
+      matrix:
+        php-versions: ['7.4']
+        databases: ['oci']
+
+    name: php${{ matrix.php-versions }}-${{ matrix.databases }}
+
+    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: ${{ env.GITHUB_BASE_REF }}
+
+      - 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 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 PHPUnit
+        working-directory: apps/${{ env.APP_NAME }}
+        run: composer i
+
+      - 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 }}
+          php -S localhost:8080 &
+
+      - name: PHPUnit
+        working-directory: apps/${{ env.APP_NAME }}/tests
+        run: ../vendor/phpunit/phpunit/phpunit -c phpunit.xml

lib/Db/CircleRequestBuilder.php

@@ -112,6 +112,8 @@ public function getItemFromRequest(CoreQueryBuilder $qb): Circle {
 			$circle = $qb->asItem(Circle::class);
 		} catch (RowNotFoundException $e) {
 			throw new CircleNotFoundException('Circle not found');
+		} catch (\Exception $e) {
+			throw new \Exception($qb->getSQL());
 		}
 
 		return $circle;

lib/Db/CoreQueryBuilder.php

@@ -56,30 +56,29 @@ class CoreQueryBuilder extends ExtendedQueryBuilder {
 	use TArrayTools;
 
 
-	public const SINGLE = 'single';
-	public const CIRCLE = 'circle';
-	public const MEMBER = 'member';
-	public const MEMBER_COUNT = 'membercount';
-	public const OWNER = 'owner';
-	public const FEDERATED_EVENT = 'federatedevent';
-	public const REMOTE = 'remote';
-	public const BASED_ON = 'basedon';
-	public const INITIATOR = 'initiator';
-	public const DIRECT_INITIATOR = 'initiatordirect';
-	public const MEMBERSHIPS = 'memberships';
-	public const CONFIG = 'config';
-	public const UPSTREAM_MEMBERSHIPS = 'upstreammemberships';
-	public const INHERITANCE_FROM = 'inheritancefrom';
-	public const INHERITED_BY = 'inheritedby';
-	public const INVITED_BY = 'invitedby';
-	public const MOUNT = 'mount';
-	public const MOUNTPOINT = 'mountpoint';
-	public const SHARE = 'share';
-	public const FILE_CACHE = 'filecache';
-	public const STORAGES = 'storages';
-	public const TOKEN = 'token';
-	public const OPTIONS = 'options';
-	public const HELPER = 'circleshelper';
+	public const SINGLE = 'cs';
+	public const CIRCLE = 'cc';
+	public const MEMBER = 'mm';
+	public const OWNER = 'wn';
+	public const FEDERATED_EVENT = 'ev';
+	public const REMOTE = 'rm';
+	public const BASED_ON = 'on';
+	public const INITIATOR = 'in';
+	public const DIRECT_INITIATOR = 'di';
+	public const MEMBERSHIPS = 'ms';
+	public const CONFIG = 'cf';
+	public const UPSTREAM_MEMBERSHIPS = 'up';
+	public const INHERITANCE_FROM = 'ih';
+	public const INHERITED_BY = 'by';
+	public const INVITED_BY = 'nv';
+	public const MOUNT = 'mo';
+	public const MOUNTPOINT = 'mp';
+	public const SHARE = 'sh';
+	public const FILE_CACHE = 'fc';
+	public const STORAGES = 'st';
+	public const TOKEN = 'tk';
+	public const OPTIONS = 'pt';
+	public const HELPER = 'hp';
 
 
 	public static $SQL_PATH = [
@@ -90,7 +89,6 @@ class CoreQueryBuilder extends ExtendedQueryBuilder {
 			self::OPTIONS => [
 			],
 			self::MEMBER,
-			self::MEMBER_COUNT,
 			self::OWNER => [
 				self::BASED_ON
 			],

lib/Migration/Version0024Date20220317190331.php

@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+
+/**
+ * Circles - Bring cloud-users closer together.
+ *
+ * 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 2022
+ * @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\Circles\Migration;
+
+use Closure;
+use Doctrine\DBAL\Schema\SchemaException;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version0024Date20220317190331 extends SimpleMigrationStep {
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 *
+	 * @return null|ISchemaWrapper
+	 * @throws SchemaException
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		if ($schema->hasTable('circles_membership')) {
+			$table = $schema->getTable('circles_membership');
+			if (!$table->hasPrimaryKey()) {
+				$indexes = $table->getIndexes();
+				// conflict in Oracle with existing unique index, duplicate of primaryKey.
+				foreach ($indexes as $index) {
+					if ($index->isUnique()) {
+						$table->dropIndex($index->getName());
+					}
+				}
+				$table->setPrimaryKey(['single_id', 'circle_id']);
+			}
+		}
+
+		return $schema;
+	}
+}

tests/TestSuiteListener.php

@@ -28,8 +28,14 @@
 namespace OCA\Circles\Tests;
 
 use OCA\Circles\Model\DeprecatedCircle;
-
-class Env implements \PHPUnit_Framework_TestListener {
+use PHPUnit\Framework\TestListener;
+use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestSuite;
+use PHPUnit\Framework\AssertionFailedError;
+use PHPUnit\Framework\Warning;
+use Throwable;
+
+class Env implements TestListener {
 	public const ENV_TEST_OWNER1 = '_test_circles_owner1';
 	public const ENV_TEST_OWNER2 = '_test_circles_owner2';
 	public const ENV_TEST_OWNER3 = '_test_circles_owner3';
@@ -54,31 +60,31 @@ class Env implements \PHPUnit_Framework_TestListener {
 	/** @var array<string> */
 	private $users;
 
-	public function addError(\PHPUnit_Framework_Test $test, \Exception $e, $time) {
+	public function addError(Test $test, Throwable $e, float $time): void {
 	}
 
 	public function addFailure(
-		\PHPUnit_Framework_Test $test, \PHPUnit_Framework_AssertionFailedError $e, $time
-	) {
+		Test $test, AssertionFailedError $e, float $time
+	): void {
 	}
 
-	public function addIncompleteTest(\PHPUnit_Framework_Test $test, \Exception $e, $time) {
+	public function addIncompleteTest(Test $test, Throwable $e, float $time): void {
 	}
 
-	public function addRiskyTest(\PHPUnit_Framework_Test $test, \Exception $e, $time) {
+	public function addRiskyTest(Test $test, Throwable $e, float $time): void {
 	}
 
-	public function addSkippedTest(\PHPUnit_Framework_Test $test, \Exception $e, $time) {
+	public function addSkippedTest(Test $test, Throwable $e, float $time): void {
 	}
 
-	public function startTest(\PHPUnit_Framework_Test $test) {
+	public function startTest(Test $test): void {
 	}
 
-	public function endTest(\PHPUnit_Framework_Test $test, $time) {
+	public function endTest(Test $test, float $time): void {
 	}
 
-	public function startTestSuite(\PHPUnit_Framework_TestSuite $suite) {
-		if ($suite->getName() !== '.') {
+	public function startTestSuite(TestSuite $suite): void {
+		if ($suite->getName() !== 'OCA\Circles\Tests\Api\CirclesTest') {
 			return;
 		}
 
@@ -92,7 +98,7 @@ public function startTestSuite(\PHPUnit_Framework_TestSuite $suite) {
 		}
 	}
 
-	public function endTestSuite(\PHPUnit_Framework_TestSuite $suite) {
+	public function endTestSuite(TestSuite $suite): void {
 		if ($suite->getName() !== '.') {
 			return;
 		}
@@ -106,8 +112,8 @@ public function endTestSuite(\PHPUnit_Framework_TestSuite $suite) {
 		}
 	}
 
-	public function addWarning(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_Warning $e, $time
-	) {
+	public function addWarning(Test $test, Warning $e, float $time
+	): void {
 	}
 
 	public static function setUser($which) {
@@ -117,8 +123,7 @@ public static function setUser($which) {
 						->get($which)
 		);
 
-		return $userSession->getUser()
-						   ->getUID();
+		return $userSession->getUser()->getUID();
 	}
 
 	public static function currentUser() {

tests/bootstrap.php

@@ -1,8 +1,12 @@
 <?php
 
+define('PHPUNIT_RUN', 1);
 
 require_once __DIR__.'/../../../lib/base.php';
 require_once __DIR__.'/../vendor/autoload.php';
 
-\OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
+\OC::$composerAutoloader->addPsr4('Tests\\', OC::$SERVERROOT . '/tests/unit/', true);
+
 \OC_App::loadApp('circles');
+
+OC_Hook::clear();

tests/phpunit.xml

@@ -17,4 +17,4 @@
 		<listener class="OCA\Circles\Tests\Env" file="TestSuiteListener.php"/>
 	</listeners>
 
-</phpunit>
+</phpunit>