Merge pull request #4228 from nextcloud/fix/migration-table-name

use correct table name

Author: dartcafe

CHANGELOG.md

@@ -5,8 +5,8 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## [8.3.1] - 2025-08-22
- - Fix migration from 7.x to 8.x
+## [8.3.3] - 2025-08-24
+ - Fix migration
 
 ### Fixed (v8.3.0)
  - Made description sticky again on horizontal scrolling
@@ -27,6 +27,9 @@ All notable changes to this project will be documented in this file.
    - Make comments available to owner and delegated poll administration if commenting is disabled
    - Add hint, if commenting is disabled
 
+## [8.3.2] - 2025-08-22
+ - Fix migration from 7.x to 8.x
+
 ## [8.3.0] - 2025-08-21
 If you experience update problems, please refer to [this article](https://github.com/nextcloud/polls/wiki/Installation-help#update-issues)
 

appinfo/info.xml

@@ -4,7 +4,7 @@
   <name>Polls</name>
   <summary>A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access.</summary>
   <description>A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).</description>
-  <version>8.3.2</version>
+  <version>8.3.3-alpha.2</version>
   <licence>agpl</licence>
   <author>Vinzenz Rosenkranz</author>
   <author>René Gieling</author>

lib/Command/Db/Rebuild.php

@@ -99,6 +99,7 @@ private function fixNullish(): void {
 		$messages = $this->tableManager->fixNullishPollGroupRelations();
 		$this->printInfo($messages, '   ');
 	}
+
 	/**
 	 * Create index for $table
 	 */

lib/Db/V2/TableManager.php

@@ -29,9 +29,6 @@
 
 class TableManager extends DbManager {
 
-	// private string $dbPrefix;
-	// private Schema|ISchemaWrapper $schema;
-
 	/** @psalm-suppress PossiblyUnusedMethod */
 	public function __construct(
 		protected IConfig $config,
@@ -41,27 +38,8 @@ public function __construct(
 		private VoteMapper $voteMapper,
 	) {
 		parent::__construct($config, $connection);
-		// $this->dbPrefix = $this->config->getSystemValue('dbtableprefix', 'oc_');
 	}
 
-	// public function setSchema(Schema|ISchemaWrapper &$schema): void {
-	// 	$this->schema = $schema;
-	// }
-
-	// public function createSchema(): Schema {
-	// 	$this->schema = $this->connection->createSchema();
-	// 	return $this->schema;
-	// }
-	// public function migrateToSchema() : void {
-	// 	// Schema must be of class Schema
-	// 	$this->needsSchema(iSchemWrapperClass: false);
-	// 	$this->connection->migrateToSchema($this->schema);
-	// }
-
-	// public function setConnection(IDBConnection &$connection): void {
-	// 	$this->connection = $connection;
-	// }
-
 	/**
 	 * @return string[]
 	 *
@@ -464,23 +442,22 @@ public function fixNullishShares(): array {
 		$query = $this->connection->getQueryBuilder();
 		$schema = $this->connection->createSchema();
 
-		if (!$schema->hasTable(Share::TABLE)) {
-			$messages[] = 'Table ' . Share::TABLE . ' does not exist';
+		if (!$schema->hasTable($this->dbPrefix . Share::TABLE)) {
+			$messages[] = 'Table ' . $this->dbPrefix . Share::TABLE . ' does not exist';
 			return $messages;
 		}
 
-		$table = $schema->getTable(Share::TABLE);
+		$table = $schema->getTable($this->dbPrefix . Share::TABLE);
 
 		if ($table->hasColumn('group_id')) {
 			// replace all nullish group_ids with 0 in share table
 			$query->update(Share::TABLE)
 				->set('group_id', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
 				->where($query->expr()->isNull('group_id'));
-
 			$count = $query->executeStatement();
 
 			if ($count > 0) {
-				$messages[] = 'Updated ' . $count . ' shares and set group_id to 0 for nullish values';
+				$messages[] = 'Updated ' . $count . ' shares with nullish group_id and set group_id to 0';
 			}
 		}
 
@@ -506,6 +483,12 @@ public function fixNullishShares(): array {
 	public function fixNullishPollGroupRelations(): array {
 		$messages = [];
 		$query = $this->connection->getQueryBuilder();
+		$schema = $this->connection->createSchema();
+
+		if (!$schema->hasTable($this->dbPrefix . PollGroup::RELATION_TABLE)) {
+			$messages[] = 'Table ' . $this->dbPrefix . PollGroup::RELATION_TABLE . ' does not exist';
+			return $messages;
+		}
 
 		// replace all nullish group_ids with 0 in share table
 		$query->update(PollGroup::RELATION_TABLE)
@@ -611,37 +594,4 @@ public function migrateOptionsToHash(): array {
 		}
 		return $messages;
 	}
-
-	// protected function getTableName(string $tableName): ?string {
-	// 	if ($this->schema instanceof Schema) {
-	// 		// If the schema is an instance of Schema, we need to prefix the table name
-	// 		return $this->config->getSystemValue('dbtableprefix', 'oc_') . $tableName;
-	// 	}
-	// 	return $tableName;
-	// }
-
-	// protected function needsSchema(bool $schemaClass = true, bool $iSchemWrapperClass = true): void {
-	// 	if (($this->schema instanceof Schema) && $schemaClass) {
-	// 		return;
-	// 	}
-
-	// 	if (($this->schema instanceof ISchemaWrapper) && $iSchemWrapperClass) {
-	// 		return;
-	// 	}
-
-	// 	if ($schemaClass && $iSchemWrapperClass) {
-	// 		// If the schema is not set or not an instance of Schema or ISchemaWrapper, throw an exception
-	// 		throw new Exception('Schema is not set or not an instance of Schema or ISchemaWrapper');
-	// 	}
-	// 	if ($schemaClass) {
-	// 		// If the schema is not set or not an instance of Schema, throw an exception
-	// 		throw new Exception('Schema is not set or not an instance of Schema');
-	// 	}
-	// 	if ($iSchemWrapperClass) {
-	// 		// If the schema is not set or not an instance of ISchemaWrapper, throw an exception
-	// 		throw new Exception('Schema is not set or not an instance of ISchemaWrapper');
-	// 	}
-	// 	throw new Exception('Unexpected. Schema is an instance of ' . get_class($this->schema));
-	// }
-
 }

…tion/Version080301Date20250822182903.php …tion/Version080303Date20250824090101.phplib/Migration/Version080301Date20250822182903.php renamed to lib/Migration/Version080303Date20250824090101.php lib/Migration/Version080301Date20250822182903.php renamed to lib/Migration/Version080303Date20250824090101.php

@@ -24,7 +24,7 @@
  *
  * @psalm-suppress UnusedClass
  */
-class Version080301Date20250822182903 extends SimpleMigrationStep {
+class Version080303Date20250824090101 extends SimpleMigrationStep {
 	private ISchemaWrapper $schema;
 	private ?IOutput $output = null;
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "polls",
-  "version": "8.3.2",
+  "version": "8.3.3-alpha.2",
   "private": true,
   "description": "Polls app for nextcloud",
   "homepage": "https://github.com/nextcloud/polls#readme",