Skip to content

[SQL] Incorrect login_summary_statistics table name in LORIS 27 SQL patch - main #10151

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[SQL] Incorrect login_summary_statistics table name in LORIS 27 SQL patch - main #10151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 SQL/0000-00-00-schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2571,7 +2571,7 @@ CREATE TABLE `publication_users_edit_perm_rel` (
CONSTRAINT `FK_publication_users_edit_perm_rel_UserID` FOREIGN KEY (`UserID`) REFERENCES `users` (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET='utf8';

CREATE TABLE login_summary_statistics (
CREATE TABLE Login_Summary_Statistics (
Title VARCHAR(255),
Project VARCHAR(255),
Value INT,
Expand Down
2 changes: 1 addition & 1 deletion SQL/9999-99-99-drop_tables.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ DROP TABLE IF EXISTS `publication`;
DROP TABLE IF EXISTS `publication_status`;
DROP TABLE IF EXISTS `publication_collaborator`;

DROP TABLE IF EXISTS `login_summary_statistics`;
DROP TABLE IF EXISTS `Login_Summary_Statistics`;

DROP TABLE IF EXISTS `parameter_session`;
DROP TABLE IF EXISTS `parameter_file`;
Expand Down
4 changes: 2 additions & 2 deletions modules/login/php/summary_statistics.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Summary_Statistics extends \NDB_Page implements ETagCalculator
case 'GET':
$DB = $this->loris->getDatabaseConnection();
$response = $DB->pselect(
"SELECT * FROM login_summary_statistics
"SELECT * FROM Login_Summary_Statistics
WHERE Value > 0
ORDER BY QueryOrder ASC",
[],
Expand All @@ -40,7 +40,7 @@ class Summary_Statistics extends \NDB_Page implements ETagCalculator
return new \LORIS\Http\Response\JsonResponse(null);
}
$projects = $DB->pselectCol(
"SELECT DISTINCT Project FROM login_summary_statistics",
"SELECT DISTINCT Project FROM Login_Summary_Statistics",
[]
);

Expand Down
56 changes: 28 additions & 28 deletions raisinbread/RB_files/RB_login_summary_statistics.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
SET FOREIGN_KEY_CHECKS=0;
TRUNCATE TABLE `login_summary_statistics`;
LOCK TABLES `login_summary_statistics` WRITE;
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('EEG Recording','All Projects',10,7);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('EEG Recording','Pumpernickel',10,7);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Female Participant','All Projects',334,1);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Female Participant','Challah',47,1);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Female Participant','Pumpernickel',225,1);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Female Participant','Rye',62,1);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Instrument','All Projects',5,5);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Instrument','Challah',5,5);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Instrument','Pumpernickel',5,5);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Instrument','Rye',2,5);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Male Participant','All Projects',328,2);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Male Participant','Challah',60,2);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Male Participant','Pumpernickel',210,2);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Male Participant','Rye',58,2);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Scan','All Projects',311,6);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Scan','Challah',23,6);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Scan','Pumpernickel',247,6);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Scan','Rye',41,6);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Site','All Projects',4,3);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Site','Challah',1,3);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Site','Pumpernickel',4,3);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Site','Rye',1,3);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Visit','All Projects',1133,4);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Visit','Challah',147,4);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Visit','Pumpernickel',855,4);
INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Visit','Rye',131,4);
TRUNCATE TABLE `Login_Summary_Statistics`;
LOCK TABLES `Login_Summary_Statistics` WRITE;
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('EEG Recording','All Projects',10,7);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('EEG Recording','Pumpernickel',10,7);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Female Participant','All Projects',334,1);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Female Participant','Challah',47,1);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Female Participant','Pumpernickel',225,1);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Female Participant','Rye',62,1);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Instrument','All Projects',5,5);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Instrument','Challah',5,5);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Instrument','Pumpernickel',5,5);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Instrument','Rye',2,5);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Male Participant','All Projects',328,2);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Male Participant','Challah',60,2);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Male Participant','Pumpernickel',210,2);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Male Participant','Rye',58,2);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Scan','All Projects',311,6);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Scan','Challah',23,6);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Scan','Pumpernickel',247,6);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Scan','Rye',41,6);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Site','All Projects',4,3);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Site','Challah',1,3);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Site','Pumpernickel',4,3);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Site','Rye',1,3);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Visit','All Projects',1133,4);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Visit','Challah',147,4);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Visit','Pumpernickel',855,4);
INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Visit','Rye',131,4);
UNLOCK TABLES;
SET FOREIGN_KEY_CHECKS=1;
4 changes: 2 additions & 2 deletions tools/update_login_summary_statistics.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
);
$user = (new \User())->factory('admin');
$data = ['All Projects' => []];
$DB->run("DELETE FROM login_summary_statistics", []);
$DB->run("DELETE FROM Login_Summary_Statistics", []);
foreach ($projects as $project) {
$data[$project] = [];
}
Expand Down Expand Up @@ -155,7 +155,7 @@
foreach ($data as $project => $values) {
foreach ($values as $title => $value) {
$DB->insertOnDuplicateUpdate(
'login_summary_statistics',
'Login_Summary_Statistics',
[
'Project' => $project,
'Title' => $title,
Expand Down
Loading