feat: add UUIDs to columns

.scoper-production-dependencies

@@ -7,3 +7,5 @@ psr/http-client
 psr/http-factory
 psr/http-message
 psr/simple-cache
+symfony/uid
+symfony/polyfill-uuid

appinfo/info.xml

@@ -26,7 +26,7 @@ Share your tables and views with users and groups within your cloud.
 Have a good time and manage whatever you want.
 
 ]]></description>
-	<version>2.1.1</version>
+	<version>2.2.0-dev.0</version>
 	<licence>AGPL-3.0-or-later</licence>
 	<author mail="florian.steffens@nextcloud.com">Florian Steffens</author>
 	<namespace>Tables</namespace>

composer.json

@@ -66,6 +66,7 @@
   "require": {
     "phpoffice/phpspreadsheet": "^5.1",
     "ext-json": "*",
-    "bamarni/composer-bin-plugin": "^1.9.1"
+    "bamarni/composer-bin-plugin": "^1.9.1",
+    "symfony/uid": "^6.4"
   }
 }

lib/Db/Column.php

@@ -13,13 +13,15 @@
 use OCA\Tables\Dto\Column as ColumnDto;
 use OCA\Tables\ResponseDefinitions;
 use OCA\Tables\Service\ValueObject\ViewColumnInformation;
+use OCA\Tables\Vendor\Symfony\Component\Uid\Uuid;
 use ValueError;
 
 /**
  * @psalm-suppress PropertyNotSetInConstructor
  *
  * @psalm-import-type TablesColumn from ResponseDefinitions
  *
+ * @method string getUuid()
  * @method getTitle(): string
  * @method setTitle(string $title)
  * @method getTableId(): int
@@ -59,13 +61,11 @@
  * @method setTextDefault(?string $textDefault)
  * @method getTextAllowedPattern(): string
  * @method setTextAllowedPattern(?string $textAllowedPattern)
- * @method getTextAllowedPattern(): ?string
  * @method getTextMaxLength(): int
  * @method setTextMaxLength(?int $textMaxLength)
  * @method getTextUnique(): bool
  * @method setTextUnique(?bool $textUnique)
  * @method getSelectionOptions(): string
- * @method getSelectionDefault(): string
  * @method setSelectionOptions(?string $selectionOptionsArray)
  * @method setSelectionDefault(?string $selectionDefault)
  * @method getSelectionDefault(): ?string
@@ -114,6 +114,7 @@ class Column extends EntitySuper implements JsonSerializable {
 
 	public const META_ID_TITLE = 'id';
 
+	protected ?string $uuid = null;
 	protected ?string $title = null;
 	protected ?int $tableId = null;
 	protected ?string $createdBy = null;
@@ -165,6 +166,7 @@ class Column extends EntitySuper implements JsonSerializable {
 
 	public function __construct() {
 		$this->addType('id', 'integer');
+		$this->addType('uuid', 'string');
 		$this->addType('tableId', 'integer');
 		$this->addType('mandatory', 'boolean');
 
@@ -198,8 +200,23 @@ public static function isValidMetaTypeId(int $metaTypeId): bool {
 		], true);
 	}
 
+	private function assignUuid(): void {
+		if ($this->uuid !== null) {
+			throw new \RuntimeException('This column already has a UUID, they are immutable');
+		}
+		$this->uuid = Uuid::v7()->toRfc4122();
+	}
+
+	protected function setUuid(string $uuid): void {
+		if ($this->uuid !== null) {
+			throw new \RuntimeException('This column already has a UUID, they are immutable');
+		}
+		$this->uuid = $uuid;
+	}
+
 	public static function fromDto(ColumnDto $data): self {
 		$column = new self();
+		$column->assignUuid();
 		$column->setTitle($data->getTitle());
 		$column->setType($data->getType());
 		$column->setSubtype($data->getSubtype() ?? '');
@@ -262,6 +279,7 @@ public function setSelectionOptionsArray(array $array):void {
 	public function jsonSerialize(): array {
 		return [
 			'id' => $this->id,
+			'uuid' => $this->uuid,
 			'tableId' => $this->tableId,
 			'title' => $this->title,
 			'createdBy' => $this->createdBy,

lib/Migration/Version2020Date20260513185340.php

@@ -0,0 +1,96 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Tables\Migration;
+
+use Closure;
+use OCA\Tables\Vendor\Symfony\Component\Uid\Uuid;
+use OCP\DB\ISchemaWrapper;
+use OCP\DB\Types;
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+use Override;
+
+class Version2020Date20260513185340 extends SimpleMigrationStep {
+	private const TARGET_TABLE = 'tables_columns';
+	private const COL_ID = 'id';
+	private const COL_UUID = 'uuid';
+
+	public function __construct(
+		private readonly IDBConnection $db,
+	) {
+	}
+
+	#[Override]
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		$schema = $schemaClosure();
+
+		if (!$schema->hasTable(self::TARGET_TABLE)) {
+			return null;
+		}
+
+		$columnsTable = $schema->getTable(self::TARGET_TABLE);
+		if (!$columnsTable->hasColumn(self::COL_UUID)) {
+			$columnsTable->addColumn(self::COL_UUID, Types::STRING, [
+				'notnull' => false,
+				'default' => null,
+				'length' => 36,
+				'comment' => 'UUIDv7 identifier to support structural updates across instances',
+			]);
+		}
+
+		return $schema;
+	}
+
+	#[Override]
+	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+
+		$qbUpdate = $this->db->getQueryBuilder();
+		$qbUpdate->update(self::TARGET_TABLE)
+			->set(self::COL_UUID, $qbUpdate->createParameter('columnUuid'))
+			->where($qbUpdate->expr()->eq(self::COL_ID, $qbUpdate->createParameter('columnLocalId')));
+
+		$qbSelect = $this->db->getQueryBuilder();
+		$qbSelect->select(self::COL_ID)
+			->from(self::TARGET_TABLE);
+		$select = $qbSelect->executeQuery();
+
+		$writeBatches = 250;
+		$updates = 0;
+
+		try {
+			$this->db->beginTransaction();
+			while (($columnId = $select->fetchOne()) !== false) {
+				$qbUpdate->setParameters(
+					[
+						'columnLocalId' => (int)$columnId,
+						'columnUuid' => Uuid::v7()->toRfc4122(),
+					],
+					[
+						Types::INTEGER,
+						Types::STRING,
+					]
+				);
+				$qbUpdate->executeStatement();
+				$updates++;
+				if ($updates % $writeBatches === 0) {
+					$this->db->commit();
+					$this->db->beginTransaction();
+				}
+			}
+			$this->db->commit();
+		} catch (\Exception $e) {
+			$this->db->rollBack();
+			throw $e;
+		}
+
+		$select->closeCursor();
+	}
+}