Merge pull request #1766 from jstirling91/sql_patch

create release patch
aces · May 4, 2016 · ff7f7a0 · ff7f7a0
2 parents 8cf0177 + 044390a
commit ff7f7a0
Show file tree

Hide file tree

Showing 35 changed files with 406 additions and 3 deletions.
diff --git a/SQL/2015-11-02-linksTables.sql → SQL/Archive/16.0/2015-11-02-linksTables.sql b/SQL/2015-11-02-linksTables.sql → SQL/Archive/16.0/2015-11-02-linksTables.sql
diff --git a/...015-11-18-Missing_LorisMenuPermission.sql → ...015-11-18-Missing_LorisMenuPermission.sql b/...015-11-18-Missing_LorisMenuPermission.sql → ...015-11-18-Missing_LorisMenuPermission.sql
diff --git a/SQL/2015-11-26-MenuPrettyURLs.sql → ...rchive/16.0/2015-11-26-MenuPrettyURLs.sql b/SQL/2015-11-26-MenuPrettyURLs.sql → ...rchive/16.0/2015-11-26-MenuPrettyURLs.sql
diff --git a/SQL/2015-11-27-AddJWTKeyConfig.sql → ...chive/16.0/2015-11-27-AddJWTKeyConfig.sql b/SQL/2015-11-27-AddJWTKeyConfig.sql → ...chive/16.0/2015-11-27-AddJWTKeyConfig.sql
diff --git a/...onflict_resolver_menu_item_permission.sql → ...onflict_resolver_menu_item_permission.sql b/...onflict_resolver_menu_item_permission.sql → ...onflict_resolver_menu_item_permission.sql
diff --git a/...-12-01-ConfigSetting-StudyDescription.sql → ...-12-01-ConfigSetting-StudyDescription.sql b/...-12-01-ConfigSetting-StudyDescription.sql → ...-12-01-ConfigSetting-StudyDescription.sql
diff --git a/SQL/2016-01-18-Acknowledgements.sql → ...hive/16.0/2016-01-18-Acknowledgements.sql b/SQL/2016-01-18-Acknowledgements.sql → ...hive/16.0/2016-01-18-Acknowledgements.sql
@@ -17,8 +17,8 @@ CREATE TABLE `acknowledgements` (
 INSERT INTO LorisMenu (Label, OrderNumber) VALUES ('Acknowledgements', 7);
 INSERT INTO LorisMenu (Label, Link, Parent, OrderNumber) VALUES ('Acknowledgements','/acknowledgements/', (SELECT ID FROM LorisMenu as L WHERE Label='Acknowledgements'), 1);
 
-INSERT INTO permissions (permID,code,description,categoryID) VALUES (41,'acknowledgements_view','View Acknowledgements',2);
-INSERT INTO permissions (permID,code,description,categoryID) VALUES (42,'acknowledgements_edit','Edit Acknowledgements',2);
+INSERT INTO permissions (code,description,categoryID) VALUES ('acknowledgements_view','View Acknowledgements',2);
+INSERT INTO permissions (code,description,categoryID) VALUES ('acknowledgements_edit','Edit Acknowledgements',2);
 
 INSERT INTO LorisMenuPermissions (MenuID, PermID) 
     SELECT m.ID, p.PermID FROM permissions p CROSS JOIN LorisMenu m WHERE p.code='acknowledgements_view' AND m.Label='Acknowledgements';

diff --git a/...2016-01-18-RemoveShowTimingFromConfig.sql → ...2016-01-18-RemoveShowTimingFromConfig.sql b/...2016-01-18-RemoveShowTimingFromConfig.sql → ...2016-01-18-RemoveShowTimingFromConfig.sql
diff --git a/SQL/2016-01-19-EmptyQueries.sql → SQL/Archive/16.0/2016-01-19-EmptyQueries.sql b/SQL/2016-01-19-EmptyQueries.sql → SQL/Archive/16.0/2016-01-19-EmptyQueries.sql
diff --git a/...entlyProcessedRenamedInMRIUploadTable.sql → ...entlyProcessedRenamedInMRIUploadTable.sql b/...entlyProcessedRenamedInMRIUploadTable.sql → ...entlyProcessedRenamedInMRIUploadTable.sql
diff --git a/...22-IsValidatedRenamedInMRIUploadTable.sql → ...22-IsValidatedRenamedInMRIUploadTable.sql b/...22-IsValidatedRenamedInMRIUploadTable.sql → ...22-IsValidatedRenamedInMRIUploadTable.sql
diff --git a/...02-16-CriticalConflictsResolverBugFix.sql → ...02-16-CriticalConflictsResolverBugFix.sql b/...02-16-CriticalConflictsResolverBugFix.sql → ...02-16-CriticalConflictsResolverBugFix.sql
diff --git a/...ddVerboseFlagToNotificationSpoolTable.sql → ...ddVerboseFlagToNotificationSpoolTable.sql b/...ddVerboseFlagToNotificationSpoolTable.sql → ...ddVerboseFlagToNotificationSpoolTable.sql
diff --git a/...02-29-fix_imaging_uploader_permission.sql → ...02-29-fix_imaging_uploader_permission.sql b/...02-29-fix_imaging_uploader_permission.sql → ...02-29-fix_imaging_uploader_permission.sql
diff --git a/SQL/2016-03-01-showPearError.sql → ...Archive/16.0/2016-03-01-showPearError.sql b/SQL/2016-03-01-showPearError.sql → ...Archive/16.0/2016-03-01-showPearError.sql
diff --git a/...3-02-Add-Genomic-Files-GWAS-split-SNP.sql → ...3-02-Add-Genomic-Files-GWAS-split-SNP.sql b/...3-02-Add-Genomic-Files-GWAS-split-SNP.sql → ...3-02-Add-Genomic-Files-GWAS-split-SNP.sql
diff --git a/SQL/2016-03-03-addindexes.sql → SQL/Archive/16.0/2016-03-03-addindexes.sql b/SQL/2016-03-03-addindexes.sql → SQL/Archive/16.0/2016-03-03-addindexes.sql
diff --git a/SQL/2016-03-04-HelpContent.sql → SQL/Archive/16.0/2016-03-04-HelpContent.sql b/SQL/2016-03-04-HelpContent.sql → SQL/Archive/16.0/2016-03-04-HelpContent.sql
diff --git a/SQL/2016-03-09-Data_Release_Module.sql → ...e/16.0/2016-03-09-Data_Release_Module.sql b/SQL/2016-03-09-Data_Release_Module.sql → ...e/16.0/2016-03-09-Data_Release_Module.sql
diff --git a/SQL/2016-03-10-DefaultMRIUploadPath.sql → .../16.0/2016-03-10-DefaultMRIUploadPath.sql b/SQL/2016-03-10-DefaultMRIUploadPath.sql → .../16.0/2016-03-10-DefaultMRIUploadPath.sql
diff --git a/...0-MoveSelectedTo_files_qcstatus_table.sql → ...0-MoveSelectedTo_files_qcstatus_table.sql b/...0-MoveSelectedTo_files_qcstatus_table.sql → ...0-MoveSelectedTo_files_qcstatus_table.sql
diff --git a/...16-03-22-ConfigRemoveLastSlashFromURL.sql → ...16-03-22-ConfigRemoveLastSlashFromURL.sql b/...16-03-22-ConfigRemoveLastSlashFromURL.sql → ...16-03-22-ConfigRemoveLastSlashFromURL.sql
diff --git a/SQL/2016-03-22-InstrumentListOrdering.sql → ...6.0/2016-03-22-InstrumentListOrdering.sql b/SQL/2016-03-22-InstrumentListOrdering.sql → ...6.0/2016-03-22-InstrumentListOrdering.sql
diff --git a/SQL/2016-03-29-DataQuery_permission.sql → .../16.0/2016-03-29-DataQuery_permission.sql b/SQL/2016-03-29-DataQuery_permission.sql → .../16.0/2016-03-29-DataQuery_permission.sql
diff --git a/SQL/2016-04-01-DQTHelpContent.sql → ...rchive/16.0/2016-04-01-DQTHelpContent.sql b/SQL/2016-04-01-DQTHelpContent.sql → ...rchive/16.0/2016-04-01-DQTHelpContent.sql
diff --git a/SQL/2016-04-01-GenomicBrowser-CPG.sql → ...ve/16.0/2016-04-01-GenomicBrowser-CPG.sql b/SQL/2016-04-01-GenomicBrowser-CPG.sql → ...ve/16.0/2016-04-01-GenomicBrowser-CPG.sql
diff --git a/...016-04-02-GenomicBrowser-FileUploader.sql → ...016-04-02-GenomicBrowser-FileUploader.sql b/...016-04-02-GenomicBrowser-FileUploader.sql → ...016-04-02-GenomicBrowser-FileUploader.sql
diff --git a/...enuPrettyURL-server_processes_manager.sql → ...enuPrettyURL-server_processes_manager.sql b/...enuPrettyURL-server_processes_manager.sql → ...enuPrettyURL-server_processes_manager.sql
diff --git a/SQL/2016-04-05-InsertingCanBeNull.sql → ...ve/16.0/2016-04-05-InsertingCanBeNull.sql b/SQL/2016-04-05-InsertingCanBeNull.sql → ...ve/16.0/2016-04-05-InsertingCanBeNull.sql
diff --git a/SQL/2016-04-06-GenomicBrowserHelpContent.sql → .../2016-04-06-GenomicBrowserHelpContent.sql b/SQL/2016-04-06-GenomicBrowserHelpContent.sql → .../2016-04-06-GenomicBrowserHelpContent.sql
diff --git a/SQL/2016-04-20-Genomic_upload_permission.sql → .../2016-04-20-Genomic_upload_permission.sql b/SQL/2016-04-20-Genomic_upload_permission.sql → .../2016-04-20-Genomic_upload_permission.sql
diff --git a/SQL/2016-04-29-Genomic_Browser-Help_text → ...16.0/2016-04-29-Genomic_Browser-Help_text b/SQL/2016-04-29-Genomic_Browser-Help_text → ...16.0/2016-04-29-Genomic_Browser-Help_text
diff --git a/SQL/2016-04-29-ImagingUploaderUpdateHelp.sql → .../2016-04-29-ImagingUploaderUpdateHelp.sql b/SQL/2016-04-29-ImagingUploaderUpdateHelp.sql → .../2016-04-29-ImagingUploaderUpdateHelp.sql
diff --git a/SQL/Release_patches/15.10_To_16.0_upgrade.sql b/SQL/Release_patches/15.10_To_16.0_upgrade.sql
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-16.04-dev
+16.0