Merge pull request #9092 from nextcloud/bug/5200/null-null-null-stabl…

…e3.5 fix: add name_hash as nullable
nextcloud-releases · Nov 24, 2023 · 5eeaa1f · 5eeaa1f
2 parents 6df70e1 + 4d713d3
commit 5eeaa1f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/Migration/Version3500Date20231115182612.php b/lib/Migration/Version3500Date20231115182612.php
@@ -52,7 +52,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 
 		$mailboxesTable = $schema->getTable('mail_mailboxes');
 		if (!$mailboxesTable->hasColumn('name_hash')) {
-			$mailboxesTable->addColumn('name_hash', Types::STRING);
+			$mailboxesTable->addColumn('name_hash', Types::STRING, ['notnull' => false]);
 		}
 
 		return $schema;
@@ -83,7 +83,7 @@ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array
 		$qb = $this->connection->getQueryBuilder();
 		$qb->select(['id', 'name'])
 			->from('mail_mailboxes')
-			->where($qb->expr()->emptyString('name_hash'));
+			->where($qb->expr()->isNull('name_hash'));
 		$mailboxes = $qb->executeQuery();
 
 		$updateQb = $this->connection->getQueryBuilder();

diff --git a/lib/Migration/Version3500Date20231115184458.php b/lib/Migration/Version3500Date20231115184458.php
@@ -56,6 +56,11 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			$mailboxesTable->addUniqueIndex(['account_id', 'name_hash'], $indexNew);
 		}
 
+		$nameHashColumn = $mailboxesTable->getColumn('name_hash');
+		if (!$nameHashColumn->getNotnull()) {
+			$nameHashColumn->setNotnull(true);
+		}
+
 		return $schema;
 	}
 }