fix(db): make sure all instances have the same notNull for msg.attachements and msg.sources

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>

Author: julien-nc

appinfo/info.xml

@@ -62,7 +62,7 @@ Known providers:
 
 More details on how to set this up in the [admin docs](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html)
 ]]>	</description>
-	<version>2.6.0</version>
+	<version>2.6.1</version>
 	<licence>agpl</licence>
 	<author>Julien Veyssier</author>
 	<namespace>Assistant</namespace>

lib/Db/ChattyLLM/Message.php

@@ -23,10 +23,10 @@
  * @method \void setTimestamp(int $timestamp)
  * @method \int getOcpTaskId()
  * @method \void setOcpTaskId(int $ocpTaskId)
- * @method \string getSources()
- * @method \void setSources(string $sources)
- * @method \string getAttachments()
- * @method \void setAttachments(string $attachments)
+ * @method \string|null getSources()
+ * @method \void setSources(?string $sources)
+ * @method \string|null getAttachments()
+ * @method \void setAttachments(?string $attachments)
  */
 class Message extends Entity implements \JsonSerializable {
 	/** @var int */
@@ -39,9 +39,9 @@ class Message extends Entity implements \JsonSerializable {
 	protected $timestamp;
 	/** @var int */
 	protected $ocpTaskId;
-	/** @var string */
+	/** @var ?string */
 	protected $sources;
-	/** @var string */
+	/** @var ?string */
 	protected $attachments;
 
 	public static $columns = [

lib/Db/ChattyLLM/Session.php

@@ -13,27 +13,27 @@
 use OCP\DB\Types;
 
 /**
- * @method string getUserId()
- * @method void setUserId(string $userId)
- * @method \string|\null getTitle()
- * @method \void setTitle(?\string $title)
- * @method \int|\null getTimestamp()
- * @method \void setTimestamp(?\int $timestamp)
- * @method string|null getAgencyConversationToken()
- * @method void setAgencyConversationToken(?string $agencyConversationToken)
- * @method string|null getAgencyPendingActions()
- * @method void setAgencyPendingActions(?string $agencyPendingActions)
+ * @method \string getUserId()
+ * @method \void setUserId(string $userId)
+ * @method \string|null getTitle()
+ * @method \void setTitle(?string $title)
+ * @method \int getTimestamp()
+ * @method \void setTimestamp(int $timestamp)
+ * @method \string|null getAgencyConversationToken()
+ * @method \void setAgencyConversationToken(?string $agencyConversationToken)
+ * @method \string|null getAgencyPendingActions()
+ * @method \void setAgencyPendingActions(?string $agencyPendingActions)
  */
 class Session extends Entity implements \JsonSerializable {
 	/** @var string */
 	protected $userId;
-	/** @var string */
+	/** @var ?string */
 	protected $title;
 	/** @var int */
 	protected $timestamp;
-	/** @var string */
+	/** @var ?string */
 	protected $agencyConversationToken;
-	/** @var string */
+	/** @var ?string */
 	protected $agencyPendingActions;
 
 	public static $columns = [

lib/Migration/Version020601Date20250709130151.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Assistant\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\DB\Types;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version020601Date20250709130151 extends SimpleMigrationStep {
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure(): ISchemaWrapper $schemaClosure
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+		$schemaChanged = false;
+
+		// some MariaDB/MySQL instances upgraded successfully to 2.6.0 with notNull=true
+		// this makes sure we bring everybody to the same notNull value for sources and attachments
+		if ($schema->hasTable('assistant_chat_msgs')) {
+			$table = $schema->getTable('assistant_chat_msgs');
+			if ($table->hasColumn('sources')) {
+				$column = $table->getColumn('sources');
+				$column->setNotnull(false);
+				$schemaChanged = true;
+			}
+			if ($table->hasColumn('attachments')) {
+				$column = $table->getColumn('attachments');
+				$column->setNotnull(false);
+				$schemaChanged = true;
+			}
+		}
+
+		return $schemaChanged ? $schema : null;
+	}
+}