Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[25.0 Release] Hotfixes for demo #8840

Merged
merged 1 commit into from
Aug 8, 2023
Merged

[25.0 Release] Hotfixes for demo #8840

merged 1 commit into from
Aug 8, 2023

Conversation

ridz1208
Copy link
Collaborator

@ridz1208 ridz1208 commented Jul 19, 2023 •
edited
Loading

Brief summary of changes

  1. RESET FOREIGN KEY CHECKS TO 1 !!!IMPORTANT!!! @laemtl please review asap
  2. Fixes 9999 drop tables, adds omitted tables in appropriate order
  3. adds editor config setting for YML files
  4. recreate release patch in correct chronological order
  5. restore publication patch accidentally added to cleanups (publication module should be re-tested)
  6. remove instrument permissions from config.xml for RB
  7. remove corrupting old subproject files from RB
  8. update migration.md

@driusan
Copy link
Collaborator

driusan commented Jul 19, 2023

PHPCS is failing

FILE: ...e/runner/work/Loris/Loris/tools/exporters/DB_dump_table_data.php
----------------------------------------------------------------------
FOUND 6 ERRORS AFFECTING 2 LINES
----------------------------------------------------------------------
 97 | ERROR | [x] Spaces must be used to indent lines; tabs are not
    |       |     allowed
 97 | ERROR | [x] Multi-line function call not indented correctly;
    |       |     expected 8 spaces but found 1
 97 | ERROR | [x] Line indented incorrectly; expected at least 4
    |       |     spaces, found 1
 98 | ERROR | [x] Spaces must be used to indent lines; tabs are not
    |       |     allowed
 98 | ERROR | [x] Multi-line function call not indented correctly;
    |       |     expected 8 spaces but found 1
 98 | ERROR | [x] Line indented incorrectly; expected at least 4
    |       |     spaces, found 1
----------------------------------------------------------------------
PHPCBF CAN FIX THE 6 MARKED SNIFF VIOLATIONS AUTOMATICALLY
----------------------------------------------------------------------

driusan
driusan reviewed Jul 19, 2023
View reviewed changes
SQL/Release_patches/24.1_To_25.0_upgrade.sql
@@ -498,7 +451,8 @@ INSERT INTO ConfigSettings
Name="gui";

INSERT INTO Config (ConfigID, Value) SELECT ID, 'false' FROM ConfigSettings WHERE Name="useEEGBrowserVisualizationComponents";
CREATE INDEX `i_violations_resolved_extid_type` ON `violations_resolved` (`ExtID`, `TypeTable`);

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should be changing this. Was there a problem with the order that it was, even if it wasn't chronological? That's the order that the patch was in when it was tested.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't know.... we were disabling foreign keys in the same patch

driusan
driusan reviewed Jul 19, 2023
View reviewed changes
raisinbread/RB_files/RB_ConfigSettings.sql Outdated
@@ -118,6 +118,6 @@ INSERT INTO `ConfigSettings` (`ID`, `Name`, `Description`, `Visible`, `AllowMult
INSERT INTO `ConfigSettings` (`ID`, `Name`, `Description`, `Visible`, `AllowMultiple`, `DataType`, `Parent`, `Label`, `OrderNumber`) VALUES (128,'default_cohort','Default cohort used when creating scan visit',1,0,'text',69,'Default cohort',13);
INSERT INTO `ConfigSettings` (`ID`, `Name`, `Description`, `Visible`, `AllowMultiple`, `DataType`, `Parent`, `Label`, `OrderNumber`) VALUES (129,'UserMaximumDaysInactive','The maximum number of days since last login before making a user inactive.',1,0,'text',1,'Maximum Days Before Making User Inactive',30);
INSERT INTO `ConfigSettings` (`ID`, `Name`, `Description`, `Visible`, `AllowMultiple`, `DataType`, `Parent`, `Label`, `OrderNumber`) VALUES (130,'DownloadPath','Where files are downloaded',1,0,'text',26,'Downloads',4);
INSERT INTO `ConfigSettings` (`ID`, `Name`, `Description`, `Visible`, `AllowMultiple`, `DataType`, `Parent`, `Label`, `OrderNumber`) VALUES (131,'EEGUploadIncomingPath', 'Path to the upload directory for incoming EEG studies', 1, 0, 'text', 26, 'EEG Incoming Directory', 15);
INSERT INTO `ConfigSettings` (`ID`, `Name`, `Description`, `Visible`, `AllowMultiple`, `DataType`, `Parent`, `Label`, `OrderNumber`) VALUES (131,'EEGUploadIncomingPath','Path to the upload directory for incoming EEG studies',1,0,'text',26,'EEG Incoming Directory',15);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you move all the RB changes to a different PR? I think that can be merged pretty easily.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes easy

driusan
driusan reviewed Jul 19, 2023
View reviewed changes
SQL/Archive/25.0/2022-03-03-AddHEDTags.sql
@@ -44,6 +44,7 @@ INSERT INTO physiological_event_file (PhysiologicalFileID, FilePath, FileType)
UPDATE physiological_task_event te
SET EventFileID=(SELECT EventFileID FROM physiological_event_file WHERE PhysiologicalFileID=te.PhysiologicalFileID)
;
SET FOREIGN_KEY_CHECKS= 1;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't get why this is flagged as "IMPORTANT" in the description. It's a session variable, it'll be re-enabled after the patch is sourced even with this missing.

Copy link
Collaborator Author

@ridz1208 ridz1208 Jul 19, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the patch is the entire release patch because its concatenated into it. it also happens to be one of the first statements

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is fine, the FOREIGN_KEY_CHECKS is disabled for the same set of statements on both patches.

@ridz1208 ridz1208 force-pushed the 25_hotfixes_for_demo branch from 924c735 to a481d0d Compare July 19, 2023 19:30
@driusan driusan merged commit 28ae33e into aces:25.0-release Aug 8, 2023
@ridz1208 ridz1208 added this to the 25.0.1 milestone Nov 9, 2023
kongtiaowang pushed a commit to kongtiaowang/Loris that referenced this pull request Nov 29, 2023
@ridz1208 @kongtiaowang
[25.0 Release] Hotfixes for demo (aces#8840)
cfd5dde 
1. RESET FOREIGN KEY CHECKS TO 1 !!!IMPORTANT!!! @laemtl please review asap
2. Fixes 9999 drop tables, adds omitted tables in appropriate order
3. adds editor config setting for YML files
4. recreate release patch in correct chronological order
5. restore publication patch accidentally added to cleanups (publication module should be re-tested)
6. remove instrument permissions from config.xml for RB
7. remove corrupting old subproject files from RB
8. update migration.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@laemtl laemtl laemtl left review comments

@driusan driusan driusan left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
25.0.1
Development

Successfully merging this pull request may close these issues.
3 participants
@ridz1208 @driusan @laemtl