Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<frontend.artifactId>frontend-cbioportal</frontend.artifactId>
<frontend.version>v6.3.7</frontend.version>
<!-- THIS SHOULD BE KEPT IN SYNC TO VERSION IN CGDS.SQL -->
<db.version>2.14.3</db.version>
<db.version>2.14.4</db.version>
<derived_table.version>1.0.2</derived_table.version>

<!-- Version properties for dependencies that should have same version. -->
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/db-scripts/cgds.sql
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ CREATE TABLE `clinical_event` (
`PATIENT_ID` int(11) NOT NULL,
`START_DATE` int NOT NULL,
`STOP_DATE` int,
`EVENT_TYPE` varchar(20) NOT NULL,
`EVENT_TYPE` varchar(50) NOT NULL,
PRIMARY KEY (`CLINICAL_EVENT_ID`),
KEY (`PATIENT_ID`,`EVENT_TYPE`),
FOREIGN KEY (`PATIENT_ID`) REFERENCES `patient` (`INTERNAL_ID`) ON DELETE CASCADE
Expand Down Expand Up @@ -743,4 +743,4 @@ CREATE TABLE `resource_study` (

-- DB_SCHEMA_VERSION AND DERIVED_TABLE_SCHEMA_VERSION MUST BE KEPT IN SYNC WITH THE db.version AND derived_table.version PROPERTIES IN pom.xml
INSERT INTO `info` (`DB_SCHEMA_VERSION`, `GENESET_VERSION`, `DERIVED_TABLE_SCHEMA_VERSION`)
VALUES ('2.14.3', NULL, '1.0.2');
VALUES ('2.14.4', NULL, '1.0.2');
5 changes: 5 additions & 0 deletions src/main/resources/db-scripts/migration.sql
Original file line number Diff line number Diff line change
Expand Up @@ -1078,3 +1078,8 @@ UPDATE `info` SET `DB_SCHEMA_VERSION`="2.14.2";
##version: 2.14.3
DROP TABLE IF EXISTS `cosmic_mutation`;
UPDATE `info` SET `DB_SCHEMA_VERSION`="2.14.3";

##version: 2.14.4
-- increase varchar size to accomodate larger event type names
ALTER TABLE `clinical_event` MODIFY COLUMN `EVENT_TYPE` varchar(50) NOT NULL;
UPDATE `info` SET `DB_SCHEMA_VERSION`="2.14.4";
4 changes: 2 additions & 2 deletions src/test/resources/cgds-h2.sql
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ CREATE TABLE `clinical_event` (
`PATIENT_ID` int(11) NOT NULL,
`START_DATE` int NOT NULL,
`STOP_DATE` int,
`EVENT_TYPE` varchar(20) NOT NULL,
`EVENT_TYPE` varchar(50) NOT NULL,
PRIMARY KEY (`CLINICAL_EVENT_ID`),
KEY (`PATIENT_ID`, `EVENT_TYPE`),
FOREIGN KEY (`PATIENT_ID`) REFERENCES `patient` (`INTERNAL_ID`) ON DELETE CASCADE
Expand Down Expand Up @@ -737,4 +737,4 @@ CREATE TABLE `resource_study` (

-- DB_SCHEMA_VERSION AND DERIVED_TABLE_SCHEMA_VERSION MUST BE KEPT IN SYNC WITH THE db.version AND derived_table.version PROPERTIES IN pom.xml
INSERT INTO `info` (`DB_SCHEMA_VERSION`, `GENESET_VERSION`, `DERIVED_TABLE_SCHEMA_VERSION`)
VALUES ('2.14.3', NULL, '1.0.0');
VALUES ('2.14.4', NULL, '1.0.0');
4 changes: 2 additions & 2 deletions src/test/resources/cgds.sql
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ CREATE TABLE `clinical_event` (
`PATIENT_ID` int(11) NOT NULL,
`START_DATE` int NOT NULL,
`STOP_DATE` int,
`EVENT_TYPE` varchar(20) NOT NULL,
`EVENT_TYPE` varchar(50) NOT NULL,
PRIMARY KEY (`CLINICAL_EVENT_ID`),
KEY (`PATIENT_ID`, `EVENT_TYPE`),
FOREIGN KEY (`PATIENT_ID`) REFERENCES `patient` (`INTERNAL_ID`) ON DELETE CASCADE
Expand Down Expand Up @@ -737,4 +737,4 @@ CREATE TABLE `resource_study` (

-- DB_SCHEMA_VERSION AND DERIVED_TABLE_SCHEMA_VERSION MUST BE KEPT IN SYNC WITH THE db.version AND derived_table.version PROPERTIES IN pom.xml
INSERT INTO `info` (`DB_SCHEMA_VERSION`, `GENESET_VERSION`, `DERIVED_TABLE_SCHEMA_VERSION`)
VALUES ('2.14.3', NULL, '1.0.0');
VALUES ('2.14.4', NULL, '1.0.0');
Loading