From 16cedbff2cf57d02a297bb6016328b23ff465a46 Mon Sep 17 00:00:00 2001 From: Deep Sidhu Date: Fri, 13 Oct 2023 14:54:12 -0500 Subject: [PATCH] Updated version numbers, migrations, and CHANGELOG for release --- CHANGELOG.md | 2 +- build.gradle.kts | 2 +- .../bioinformatics/irida/database/all-changes.xml | 2 +- .../irida/database/changesets/23.10/all-changes.xml | 7 +++++++ .../{unreleased => 23.10}/user-table-user-type.xml | 0 .../database/changesets/unreleased/all-changes.xml | 1 - .../unreleased/set-default-sample-objects.xml | 12 ++++++++++++ 7 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/ca/corefacility/bioinformatics/irida/database/changesets/23.10/all-changes.xml rename src/main/resources/ca/corefacility/bioinformatics/irida/database/changesets/{unreleased => 23.10}/user-table-user-type.xml (100%) create mode 100644 src/main/resources/ca/corefacility/bioinformatics/irida/database/changesets/unreleased/set-default-sample-objects.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bf5f2118f..966cd43dab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [Unreleased] +## [23.10] - 2023/10/15 * [Developer]: Added functionality to delete sequence files from file system when a sequence run is removed. [See PR 1468](https://github.com/phac-nml/irida/pull/1468) * [Developer]: Added script to do initial cleanup of sequence files from file system. [See PR 1469](https://github.com/phac-nml/irida/pull/1469) * [UI]: Add identifier to project drop-down on project synchronization page. See [PR 1474](https://github.com/phac-nml/irida/pull/1474) diff --git a/build.gradle.kts b/build.gradle.kts index 23064b84fc..6355e8b1ba 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,7 @@ plugins { } group = "ca.corefacility.bioinformatics" -version = "23.05-SNAPSHOT" +version = "23.10" description = "irida" java { diff --git a/src/main/resources/ca/corefacility/bioinformatics/irida/database/all-changes.xml b/src/main/resources/ca/corefacility/bioinformatics/irida/database/all-changes.xml index 69bb888313..2f69882c88 100644 --- a/src/main/resources/ca/corefacility/bioinformatics/irida/database/all-changes.xml +++ b/src/main/resources/ca/corefacility/bioinformatics/irida/database/all-changes.xml @@ -74,5 +74,5 @@ - + diff --git a/src/main/resources/ca/corefacility/bioinformatics/irida/database/changesets/23.10/all-changes.xml b/src/main/resources/ca/corefacility/bioinformatics/irida/database/changesets/23.10/all-changes.xml new file mode 100644 index 0000000000..ff16e99a50 --- /dev/null +++ b/src/main/resources/ca/corefacility/bioinformatics/irida/database/changesets/23.10/all-changes.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/ca/corefacility/bioinformatics/irida/database/changesets/unreleased/user-table-user-type.xml b/src/main/resources/ca/corefacility/bioinformatics/irida/database/changesets/23.10/user-table-user-type.xml similarity index 100% rename from src/main/resources/ca/corefacility/bioinformatics/irida/database/changesets/unreleased/user-table-user-type.xml rename to src/main/resources/ca/corefacility/bioinformatics/irida/database/changesets/23.10/user-table-user-type.xml diff --git a/src/main/resources/ca/corefacility/bioinformatics/irida/database/changesets/unreleased/all-changes.xml b/src/main/resources/ca/corefacility/bioinformatics/irida/database/changesets/unreleased/all-changes.xml index ff16e99a50..a4e4c20741 100644 --- a/src/main/resources/ca/corefacility/bioinformatics/irida/database/changesets/unreleased/all-changes.xml +++ b/src/main/resources/ca/corefacility/bioinformatics/irida/database/changesets/unreleased/all-changes.xml @@ -3,5 +3,4 @@ - \ No newline at end of file diff --git a/src/main/resources/ca/corefacility/bioinformatics/irida/database/changesets/unreleased/set-default-sample-objects.xml b/src/main/resources/ca/corefacility/bioinformatics/irida/database/changesets/unreleased/set-default-sample-objects.xml new file mode 100644 index 0000000000..a11048e793 --- /dev/null +++ b/src/main/resources/ca/corefacility/bioinformatics/irida/database/changesets/unreleased/set-default-sample-objects.xml @@ -0,0 +1,12 @@ + + + + + + UPDATE sample AS t, (SELECT * FROM sample s LEFT JOIN (SELECT id as sequencing_object_id, sample_id FROM sample_sequencingobject) sso ON sso.sample_id=s.id LEFT JOIN (select id as pair_id from sequence_file_pair) sfp ON sso.sequencing_object_id = sfp.pair_id WHERE s.id=t.id ORDER BY ISNULL(sfp.pair_id), sfp.pair_id ASC LIMIT 1) AS l SET t.default_sequencing_object=l.pair_id WHERE t.id=37 AND t.default_sequencing_object IS NULL; + + + \ No newline at end of file