Use table prefix in metadata migration

Signed-off-by: Louis Chemineau <louis@chmn.me>
nextcloud · Mar 4, 2024 · dee1181 · dee1181
1 parent 0045e76
commit dee1181
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/core/BackgroundJobs/MetadataMigrationJob.php b/core/BackgroundJobs/MetadataMigrationJob.php
@@ -29,6 +29,7 @@
 use OCP\BackgroundJob\IJobList;
 use OCP\BackgroundJob\TimedJob;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IConfig;
 use OCP\IDBConnection;
 
 // Migrate oc_file_metadata.metadata to oc_file_metadata.value.
@@ -40,6 +41,7 @@ public function __construct(
 		ITimeFactory $time,
 		private IDBConnection $db,
 		private IJobList $jobList,
+		private IConfig $config,
 	) {
 		parent::__construct($time);
 
@@ -48,7 +50,8 @@ public function __construct(
 	}
 
 	protected function run(mixed $argument): void {
-		if (!$this->db->createSchema()->getTable('oc_file_metadata')->hasColumn('metadata')) {
+		$prefix = $this->config->getSystemValueString('dbtableprefix', 'oc_');
+		if (!$this->db->createSchema()->getTable($prefix.'file_metadata')->hasColumn('metadata')) {
 			return;
 		}
 

diff --git a/lib/private/Repair/AddMetadataMigrationJob.php b/lib/private/Repair/AddMetadataMigrationJob.php
@@ -24,6 +24,7 @@
 
 use OC\Core\BackgroundJobs\MetadataMigrationJob;
 use OCP\BackgroundJob\IJobList;
+use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
@@ -32,6 +33,7 @@ class AddMetadataMigrationJob implements IRepairStep {
 	public function __construct(
 		private IJobList $jobList,
 		private IDBConnection $db,
+		private IConfig $config,
 	) {
 	}
 
@@ -41,7 +43,9 @@ public function getName() {
 
 	public function run(IOutput $output) {
 		$schema = $this->db->createSchema();
-		$metadataTable = $schema->getTable('oc_file_metadata');
+
+		$prefix = $this->config->getSystemValueString('dbtableprefix', 'oc_');
+		$metadataTable = $schema->getTable($prefix.'file_metadata');
 
 		if (!$metadataTable->hasColumn('metadata')) {
 			return;