Merge pull request #25922 from nextcloud/backport/25882/stable21

[stable21] Filter out tables that does not belong to Nextcloud
nextcloud · Mar 4, 2021 · 27e2f06 · 27e2f06
2 parents 5a39900 + 549cefe
commit 27e2f06
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/private/DB/Migrator.php b/lib/private/DB/Migrator.php
@@ -181,9 +181,9 @@ public function createSchema() {
 			/** @var string|AbstractAsset $asset */
 			$filterExpression = $this->getFilterExpression();
 			if ($asset instanceof AbstractAsset) {
-				return preg_match($filterExpression, $asset->getName()) !== false;
+				return preg_match($filterExpression, $asset->getName()) === 1;
 			}
-			return preg_match($filterExpression, $asset) !== false;
+			return preg_match($filterExpression, $asset) === 1;
 		});
 		return $this->connection->getSchemaManager()->createSchema();
 	}
@@ -210,9 +210,9 @@ protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $conn
 			/** @var string|AbstractAsset $asset */
 			$filterExpression = $this->getFilterExpression();
 			if ($asset instanceof AbstractAsset) {
-				return preg_match($filterExpression, $asset->getName()) !== false;
+				return preg_match($filterExpression, $asset->getName()) === 1;
 			}
-			return preg_match($filterExpression, $asset) !== false;
+			return preg_match($filterExpression, $asset) === 1;
 		});
 		$sourceSchema = $connection->getSchemaManager()->createSchema();