-
Notifications
You must be signed in to change notification settings - Fork 33
feat: add relation column type #2248
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Koc
wants to merge
1
commit into
main
Choose a base branch
from
feature/add-relations-column-type
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,214
−24
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
| namespace OCA\Tables\Db; | ||
|
|
||
| /** @template-extends RowCellSuper<RowCellRelation> */ | ||
| class RowCellRelation extends RowCellSuper { | ||
| protected ?int $value = null; | ||
|
|
||
| public function __construct() { | ||
| parent::__construct(); | ||
| $this->addType('value', 'integer'); | ||
| } | ||
|
|
||
| public function jsonSerialize(): array { | ||
| return parent::jsonSerializePreparation($this->value); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
| namespace OCA\Tables\Db; | ||
|
|
||
| use OCP\DB\QueryBuilder\IQueryBuilder; | ||
| use OCP\IDBConnection; | ||
|
|
||
| /** @template-extends RowCellMapperSuper<RowCellRelation, int|null, int|null> */ | ||
| class RowCellRelationMapper extends RowCellMapperSuper { | ||
| protected string $table = 'tables_row_cells_relation'; | ||
|
|
||
| public function __construct(IDBConnection $db) { | ||
| parent::__construct($db, $this->table, RowCellRelation::class); | ||
| } | ||
|
|
||
| /** | ||
| * @inheritDoc | ||
| */ | ||
| public function hasMultipleValues(): bool { | ||
| return false; | ||
| } | ||
|
|
||
| /** | ||
| * @inheritDoc | ||
| */ | ||
| public function getDbParamType() { | ||
| return IQueryBuilder::PARAM_INT; | ||
| } | ||
|
|
||
| public function formatRowData(Column $column, array $row) { | ||
| $value = $row['value']; | ||
| return (int)$value; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| <?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 OCP\DB\ISchemaWrapper; | ||
| use OCP\DB\Types; | ||
| use OCP\Migration\IOutput; | ||
| use OCP\Migration\SimpleMigrationStep; | ||
|
|
||
| class Version002001Date20260109000000 extends SimpleMigrationStep { | ||
| public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { | ||
| /** @var ISchemaWrapper $schema */ | ||
| $schema = $schemaClosure(); | ||
|
|
||
| $changes = $this->createRowValueTable($schema, 'relation', Types::INTEGER); | ||
| return $changes; | ||
| } | ||
|
|
||
| private function createRowValueTable(ISchemaWrapper $schema, string $name, string $type): ?ISchemaWrapper { | ||
| if (!$schema->hasTable('tables_row_cells_' . $name)) { | ||
| $table = $schema->createTable('tables_row_cells_' . $name); | ||
| $table->addColumn('id', Types::INTEGER, [ | ||
| 'autoincrement' => true, | ||
| 'notnull' => true, | ||
| ]); | ||
| $table->addColumn('column_id', Types::INTEGER, ['notnull' => true]); | ||
| $table->addColumn('row_id', Types::INTEGER, ['notnull' => true]); | ||
| $table->addColumn('value', $type, ['notnull' => false]); | ||
| $table->addColumn('last_edit_at', Types::DATETIME, ['notnull' => true]); | ||
| $table->addColumn('last_edit_by', Types::STRING, ['notnull' => true, 'length' => 64]); | ||
| $table->addIndex(['column_id', 'row_id']); | ||
| $table->addIndex(['column_id', 'value']); | ||
| $table->setPrimaryKey(['id']); | ||
| return $schema; | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| namespace OCA\Tables\Service\ColumnTypes; | ||
|
|
||
| use OCA\Tables\Db\Column; | ||
| use OCA\Tables\Errors\BadRequestError; | ||
| use OCA\Tables\Service\RelationService; | ||
| use Psr\Log\LoggerInterface; | ||
|
|
||
| class RelationBusiness extends SuperBusiness implements IColumnTypeBusiness { | ||
|
|
||
| public function __construct( | ||
| LoggerInterface $logger, | ||
| private RelationService $relationService, | ||
| ) { | ||
| parent::__construct($logger); | ||
| } | ||
|
|
||
| /** | ||
| * @param mixed $value (array|string|null) | ||
| * @param Column|null $column | ||
| * @return string | ||
| */ | ||
| public function parseValue($value, ?Column $column = null): string { | ||
| if (!$column) { | ||
| $this->logger->warning('No column given, but expected on ' . __FUNCTION__ . ' within ' . __CLASS__, ['exception' => new \Exception()]); | ||
| return ''; | ||
| } | ||
|
|
||
| $relationData = $this->relationService->getRelationData($column); | ||
| // try to find value by label | ||
| $matchingRelation = array_filter($relationData, fn (array $relation) => $relation['label'] === $value); | ||
| if (!empty($matchingRelation)) { | ||
| return json_encode(reset($matchingRelation)['id']); | ||
| } | ||
|
|
||
| // if not found, try to find by id | ||
| if (is_numeric($value) && isset($relationData[(int)$value])) { | ||
| return json_encode($value); | ||
| } | ||
|
|
||
| return ''; | ||
| } | ||
|
|
||
| /** | ||
| * @param mixed $value (array|string|null) | ||
| * @param Column|null $column | ||
| * @return bool | ||
| */ | ||
| public function canBeParsed($value, ?Column $column = null): bool { | ||
| if (!$column) { | ||
| $this->logger->warning('No column given, but expected on ' . __FUNCTION__ . ' within ' . __CLASS__, ['exception' => new \Exception()]); | ||
| return false; | ||
| } | ||
| if ($value === null) { | ||
| return true; | ||
| } | ||
|
|
||
| $relationData = $this->relationService->getRelationData($column); | ||
| // try to find value by label | ||
| $matchingRelation = array_filter($relationData, fn (array $relation) => $relation['label'] === $value); | ||
| if (!empty($matchingRelation)) { | ||
| return true; | ||
| } | ||
| // if not found, try to find by id | ||
| if (is_numeric($value) && isset($relationData[(int)$value])) { | ||
| return true; | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| public function validateValue(mixed $value, Column $column, string $userId, int $tableId, ?int $rowId): void { | ||
| if ($value === null || $value === '') { | ||
| return; | ||
| } | ||
| // Validate that the value exists in the target table/view | ||
| $relationData = $this->relationService->getRelationData($column); | ||
|
|
||
| // Try to find value by label first | ||
| $matchingRelation = array_filter($relationData, fn (array $relation) => $relation['label'] === $value); | ||
| if (!empty($matchingRelation)) { | ||
| return; | ||
| } | ||
|
|
||
| // If not found by label, try to find by id | ||
| if (is_numeric($value) && isset($relationData[(int)$value])) { | ||
| return; | ||
| } | ||
|
|
||
| throw new BadRequestError('Relation value does not exist in the target table/view'); | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
int(null) is 0. Is 0 a valid id? Could this cause troube?