Merge pull request #2593 from nextcloud/bugfix/2592/fix-migration-for…

…-mysql

fix(migration): Fix migration for MySQL which does not allow joining

.gitignore

@@ -24,4 +24,5 @@ cypress/videos
 cypress/snapshots
 cypress/downloads
 
-js/*hot-update.*
+js/*hot-update.*
+tests/.phpunit.result.cache

appinfo/info.xml

@@ -9,7 +9,7 @@
     <name>Photos</name>
     <summary>Your memories under your control</summary>
     <description>Your memories under your control</description>
-    <version>4.0.0</version>
+    <version>4.0.0-dev.1</version>
     <licence>agpl</licence>
     <author mail="[email protected]">John Molakvoæ</author>
     <namespace>Photos</namespace>
@@ -22,7 +22,6 @@
     <website>https://github.com/nextcloud/photos</website>
     <bugs>https://github.com/nextcloud/photos/issues</bugs>
     <repository>https://github.com/nextcloud/photos.git</repository>
-    <default_enable />
     <dependencies>
         <nextcloud min-version="31" max-version="31" />
     </dependencies>

composer.json

@@ -25,7 +25,7 @@
 		"psalm:update-baseline": "psalm.phar --threads=1 --update-baseline",
 		"psalm:clear": "psalm.phar --clear-cache && psalm --clear-global-cache",
 		"psalm:fix": "psalm.phar --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
-		"test:unit": "echo 'Only testing installation of the app'"
+		"test:unit": "vendor/bin/phpunit -c tests/phpunit.xml --color --fail-on-warning --fail-on-risky"
 	},
 	"require-dev": {
 		"bamarni/composer-bin-plugin": "^1.8",

lib/Migration/Version30000Date20240417075404.php → lib/Migration/Version30000Date20240417075405.php

@@ -11,14 +11,15 @@
 
 use Closure;
 use OCP\DB\ISchemaWrapper;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
 
 /**
  * Migrate the photosSourceFolder user config to photosSourceFolders
  */
-class Version30000Date20240417075404 extends SimpleMigrationStep {
+class Version30000Date20240417075405 extends SimpleMigrationStep {
 	public function __construct(
 		private IDBConnection $db,
 	) {
@@ -36,13 +37,26 @@ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array
 			->where($select->expr()->eq('appid', $select->expr()->literal('photos')))
 			->andWhere($select->expr()->eq('configkey', $select->expr()->literal('photosSourceFolders')));
 
+		$result = $select->executeQuery();
+		$alreadyMigrated = array_map(static fn (array $row) => $row['userid'], $result->fetchAll());
+		$result->closeCursor();
+
 		// Remove old entries for users who already have the new one
 		$delete = $this->db->getQueryBuilder();
 		$delete->delete('preferences')
 			->where($delete->expr()->eq('appid', $delete->expr()->literal('photos')))
 			->andWhere($delete->expr()->eq('configkey', $delete->expr()->literal('photosSourceFolder')))
-			->andWhere($delete->expr()->in('userid', $delete->createFunction($select->getSQL())))
-			->executeStatement();
+			->andWhere($delete->expr()->in(
+				'userid',
+				$delete->createParameter('chunk'),
+				IQueryBuilder::PARAM_STR
+			));
+
+		$chunks = array_chunk($alreadyMigrated, 1000);
+		foreach ($chunks as $chunk) {
+			$delete->setParameter('chunk', $chunk, IQueryBuilder::PARAM_STR_ARRAY);
+			$delete->executeStatement();
+		}
 
 		// Update remaining old entries to new ones
 		$update = $this->db->getQueryBuilder();