This repository was archived by the owner on Aug 1, 2025. It is now read-only.
forked from plantbreeding/brapi-Java-TestServer
-
Notifications
You must be signed in to change notification settings - Fork 0
BI-2109 - Create Sub-entity Dataset from UI #33
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
39 changes: 39 additions & 0 deletions
39
src/main/resources/db/migration/V001.001__datasets_array.sql
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,39 @@ | ||
-- See the NOTICE file distributed with this work for additional information | ||
-- regarding copyright ownership. | ||
-- | ||
-- Licensed under the Apache License, Version 2.0 (the "License"); | ||
-- you may not use this file except in compliance with the License. | ||
-- You may obtain a copy of the License at | ||
-- | ||
-- http://www.apache.org/licenses/LICENSE-2.0 | ||
-- | ||
-- Unless required by applicable law or agreed to in writing, software | ||
-- distributed under the License is distributed on an "AS IS" BASIS, | ||
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
-- See the License for the specific language governing permissions and | ||
-- limitations under the License. | ||
|
||
-- Updates trial.additional_info to have a datasets array instead of just observationDatasetId. | ||
-- Leaves observationDatasetId in place out of an abundance of caution. | ||
-- Only updates rows that don't already have datasets key (just in case the code was updated prematurely). | ||
DO | ||
$$ | ||
BEGIN | ||
UPDATE | ||
trial | ||
SET | ||
additional_info = additional_info | ||
|| JSONB_BUILD_OBJECT( | ||
'datasets', | ||
JSONB_BUILD_ARRAY( | ||
JSONB_BUILD_OBJECT( | ||
'id', additional_info->'observationDatasetId', | ||
'name', additional_info->'defaultObservationLevel', | ||
'level', '0' | ||
) | ||
) | ||
) | ||
WHERE | ||
additional_info->'datasets' IS NULL; | ||
END | ||
$$; |
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.
If the new code was run prior to running this db migration for some reason, would the trial datasets array be overwritten with the old datasetId value? If so, do we need to do any check in the migration or just leave it up to process?
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.
I think I'll update the migration to be safe.
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.
Done, 8e06edf.
I tested this change by creating an experiment with the old code, then checking out the bi-web and bi-api feature/BI-2109 branches, creating two experiments and a sub-entity dataset, then checking out the BrAPI-Java-TestServer feature/BI-2109 branch and running it to ensure the migration added the
datasets
key for the "legacy" data and preserved thedatasets
key for the "new" data.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.
sounds good