Merge pull request #23882 from nextcloud/tests/oracle

Run unit tests against oracle

Author: nickvergessen

.github/workflows/oci.yml

@@ -0,0 +1,56 @@
+name: PHPUnit
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - stable*
+
+jobs:
+  phpunit-oci8:
+    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
+
+      - 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: Set up php ${{ matrix.php-versions }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, 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
+
+      - name: PHPUnit
+        working-directory: tests
+        run: phpunit --configuration phpunit-autotest.xml --group DB,SLOWDB

apps/dav/appinfo/info.xml

@@ -5,7 +5,7 @@
 	<name>WebDAV</name>
 	<summary>WebDAV endpoint</summary>
 	<description>WebDAV endpoint</description>
-	<version>1.17.0</version>
+	<version>1.17.1</version>
 	<licence>agpl</licence>
 	<author>owncloud.org</author>
 	<namespace>DAV</namespace>

apps/dav/composer/composer/autoload_classmap.php

@@ -230,6 +230,7 @@
     'OCA\\DAV\\Migration\\Version1011Date20190725113607' => $baseDir . '/../lib/Migration/Version1011Date20190725113607.php',
     'OCA\\DAV\\Migration\\Version1011Date20190806104428' => $baseDir . '/../lib/Migration/Version1011Date20190806104428.php',
     'OCA\\DAV\\Migration\\Version1012Date20190808122342' => $baseDir . '/../lib/Migration/Version1012Date20190808122342.php',
+    'OCA\\DAV\\Migration\\Version1016Date20201109085907' => $baseDir . '/../lib/Migration/Version1016Date20201109085907.php',
     'OCA\\DAV\\Provisioning\\Apple\\AppleProvisioningNode' => $baseDir . '/../lib/Provisioning/Apple/AppleProvisioningNode.php',
     'OCA\\DAV\\Provisioning\\Apple\\AppleProvisioningPlugin' => $baseDir . '/../lib/Provisioning/Apple/AppleProvisioningPlugin.php',
     'OCA\\DAV\\RootCollection' => $baseDir . '/../lib/RootCollection.php',

apps/dav/composer/composer/autoload_static.php

@@ -245,6 +245,7 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\Migration\\Version1011Date20190725113607' => __DIR__ . '/..' . '/../lib/Migration/Version1011Date20190725113607.php',
         'OCA\\DAV\\Migration\\Version1011Date20190806104428' => __DIR__ . '/..' . '/../lib/Migration/Version1011Date20190806104428.php',
         'OCA\\DAV\\Migration\\Version1012Date20190808122342' => __DIR__ . '/..' . '/../lib/Migration/Version1012Date20190808122342.php',
+        'OCA\\DAV\\Migration\\Version1016Date20201109085907' => __DIR__ . '/..' . '/../lib/Migration/Version1016Date20201109085907.php',
         'OCA\\DAV\\Provisioning\\Apple\\AppleProvisioningNode' => __DIR__ . '/..' . '/../lib/Provisioning/Apple/AppleProvisioningNode.php',
         'OCA\\DAV\\Provisioning\\Apple\\AppleProvisioningPlugin' => __DIR__ . '/..' . '/../lib/Provisioning/Apple/AppleProvisioningPlugin.php',
         'OCA\\DAV\\RootCollection' => __DIR__ . '/..' . '/../lib/RootCollection.php',

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -242,8 +242,13 @@ public function getCalendarsForUserCount($principalUri, $excludeBirthday = true)
 		$principalUri = $this->convertPrincipal($principalUri, true);
 		$query = $this->db->getQueryBuilder();
 		$query->select($query->func()->count('*'))
-			->from('calendars')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
+			->from('calendars');
+
+		if ($principalUri === '') {
+			$query->where($query->expr()->emptyString('principaluri'));
+		} else {
+			$query->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
+		}
 
 		if ($excludeBirthday) {
 			$query->andWhere($query->expr()->neq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)));
@@ -293,13 +298,21 @@ public function getCalendarsForUser($principalUri) {
 
 		// Making fields a comma-delimited list
 		$query = $this->db->getQueryBuilder();
-		$query->select($fields)->from('calendars')
-				->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
-				->orderBy('calendarorder', 'ASC');
-		$stmt = $query->execute();
+		$query->select($fields)
+			->from('calendars')
+			->orderBy('calendarorder', 'ASC');
+
+		if ($principalUri === '') {
+			$query->where($query->expr()->emptyString('principaluri'));
+		} else {
+			$query->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
+		}
+
+		$result = $query->execute();
 
 		$calendars = [];
-		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+		while ($row = $result->fetch()) {
+			$row['principaluri'] = (string) $row['principaluri'];
 			$components = [];
 			if ($row['components']) {
 				$components = explode(',',$row['components']);
@@ -326,8 +339,7 @@ public function getCalendarsForUser($principalUri) {
 				$calendars[$calendar['id']] = $calendar;
 			}
 		}
-
-		$stmt->closeCursor();
+		$result->closeCursor();
 
 		// query for shared calendars
 		$principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
@@ -347,17 +359,19 @@ public function getCalendarsForUser($principalUri) {
 		$fields[] = 'a.transparent';
 		$fields[] = 's.access';
 		$query = $this->db->getQueryBuilder();
-		$result = $query->select($fields)
+		$query->select($fields)
 			->from('dav_shares', 's')
 			->join('s', 'calendars', 'a', $query->expr()->eq('s.resourceid', 'a.id'))
 			->where($query->expr()->in('s.principaluri', $query->createParameter('principaluri')))
 			->andWhere($query->expr()->eq('s.type', $query->createParameter('type')))
 			->setParameter('type', 'calendar')
-			->setParameter('principaluri', $principals, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY)
-			->execute();
+			->setParameter('principaluri', $principals, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY);
+
+		$result	= $query->execute();
 
 		$readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
 		while ($row = $result->fetch()) {
+			$row['principaluri'] = (string) $row['principaluri'];
 			if ($row['principaluri'] === $principalUri) {
 				continue;
 			}
@@ -428,6 +442,7 @@ public function getUsersOwnCalendars($principalUri) {
 		$stmt = $query->execute();
 		$calendars = [];
 		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+			$row['principaluri'] = (string) $row['principaluri'];
 			$components = [];
 			if ($row['components']) {
 				$components = explode(',',$row['components']);
@@ -497,6 +512,7 @@ public function getPublicCalendars() {
 			->execute();
 
 		while ($row = $result->fetch()) {
+			$row['principaluri'] = (string) $row['principaluri'];
 			list(, $name) = Uri\split($row['principaluri']);
 			$row['displayname'] = $row['displayname'] . "($name)";
 			$components = [];
@@ -563,6 +579,7 @@ public function getPublicCalendar($uri) {
 			throw new NotFound('Node with name \'' . $uri . '\' could not be found');
 		}
 
+		$row['principaluri'] = (string) $row['principaluri'];
 		list(, $name) = Uri\split($row['principaluri']);
 		$row['displayname'] = $row['displayname'] . ' ' . "($name)";
 		$components = [];
@@ -619,6 +636,7 @@ public function getCalendarByUri($principal, $uri) {
 			return null;
 		}
 
+		$row['principaluri'] = (string) $row['principaluri'];
 		$components = [];
 		if ($row['components']) {
 			$components = explode(',',$row['components']);
@@ -669,6 +687,7 @@ public function getCalendarById($calendarId) {
 			return null;
 		}
 
+		$row['principaluri'] = (string) $row['principaluri'];
 		$components = [];
 		if ($row['components']) {
 			$components = explode(',',$row['components']);
@@ -718,6 +737,7 @@ public function getSubscriptionById($subscriptionId) {
 			return null;
 		}
 
+		$row['principaluri'] = (string) $row['principaluri'];
 		$subscription = [
 			'id' => $row['id'],
 			'uri' => $row['uri'],
@@ -965,6 +985,7 @@ public function getCalendarObjects($calendarId, $calendarType = self::CALENDAR_T
 				'classification' => (int)$row['classification']
 			];
 		}
+		$stmt->closeCursor();
 
 		return $result;
 	}
@@ -995,6 +1016,7 @@ public function getCalendarObject($calendarId, $objectUri, $calendarType = self:
 			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
 		$stmt = $query->execute();
 		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
+		$stmt->closeCursor();
 
 		if (!$row) {
 			return null;

apps/dav/lib/Migration/Version1012Date20190808122342.php

@@ -69,7 +69,7 @@ public function changeSchema(IOutput $output,
 				'length' => 11,
 			]);
 			$table->addColumn('is_recurring', Types::SMALLINT, [
-				'notnull' => true,
+				'notnull' => false,
 				'length' => 1,
 			]);
 			$table->addColumn('uid', Types::STRING, [

apps/dav/lib/Migration/Version1016Date20201109085907.php

@@ -0,0 +1,61 @@
+<?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\DAV\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version1016Date20201109085907 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): ?ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		$result = $this->ensureColumnIsNullable($schema, 'calendar_reminders', 'is_recurring');
+
+		return $result ? $schema : null;
+	}
+
+	protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool {
+		$table = $schema->getTable($tableName);
+		$column = $table->getColumn($columnName);
+
+		if ($column->getNotnull()) {
+			$column->setNotnull(false);
+			return true;
+		}
+
+		return false;
+	}
+}

apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php

@@ -110,10 +110,13 @@ protected function getProps(string $user, string $path) {
 			->where($query->expr()->eq('userid', $query->createNamedParameter($user)))
 			->where($query->expr()->eq('propertypath', $query->createNamedParameter($this->formatPath($path))));
 
-
 		$result = $query->execute();
-		$data = $result->fetchAll(\PDO::FETCH_KEY_PAIR);
+		$data = [];
+		while ($row = $result->fetch()) {
+			$data[$row['propertyname']] = $row['propertyvalue'];
+		}
 		$result->closeCursor();
+
 		return $data;
 	}
 

apps/federatedfilesharing/lib/Migration/Version1010Date20200630191755.php

@@ -52,7 +52,8 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 				'notnull' => true,
 				'length' => 4,
 			]);
-			$table->addUniqueIndex(['share_id'], 'share_id_index');
+			$table->setPrimaryKey(['share_id'], 'federated_res_pk');
+//			$table->addUniqueIndex(['share_id'], 'share_id_index');
 		}
 		return $schema;
 	}

apps/oauth2/tests/Db/ClientMapperTest.php

@@ -40,6 +40,13 @@ protected function setUp(): void {
 		$this->clientMapper = new ClientMapper(\OC::$server->getDatabaseConnection());
 	}
 
+	protected function tearDown(): void {
+		$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+		$query->delete('oauth2_clients')->execute();
+
+		parent::tearDown();
+	}
+
 	public function testGetByIdentifier() {
 		$client = new Client();
 		$client->setClientIdentifier('MyAwesomeClientIdentifier');
@@ -51,7 +58,6 @@ public function testGetByIdentifier() {
 		$this->assertEquals($client, $this->clientMapper->getByIdentifier('MyAwesomeClientIdentifier'));
 	}
 
-	
 	public function testGetByIdentifierNotExisting() {
 		$this->expectException(\OCA\OAuth2\Exceptions\ClientNotFoundException::class);
 
@@ -69,7 +75,6 @@ public function testGetByUid() {
 		$this->assertEquals($client, $this->clientMapper->getByUid($client->getId()));
 	}
 
-	
 	public function testGetByUidNotExisting() {
 		$this->expectException(\OCA\OAuth2\Exceptions\ClientNotFoundException::class);