From 2c8d6a6571e3a783280ec06b8c98b6ea237cb355 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Joonas=20Kylm=C3=A4l=C3=A4?= Date: Wed, 2 Jun 2021 17:14:08 +0000 Subject: [PATCH] Bug 28490: Revert "Bug 26995: Drop column relationship from borrowers, deletedborrowers and borrower_modifications tables" This reverts commit ca0e7541ecdff13ada9ba8ffbd992c963959d30f. It was part of a patch set that removed actively used data and must be therefore reverted. Signed-off-by: Kyle M Hall Signed-off-by: Petro Vashchuk Signed-off-by: Emmi Takkinen Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart --- C4/Auth_with_ldap.pm | 1 + C4/SIP/ILS/Patron.pm | 1 + installer/data/mysql/kohastructure.sql | 3 +++ 3 files changed, 5 insertions(+) diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm index c87ea20c93..87a0538dea 100644 --- a/C4/Auth_with_ldap.pm +++ b/C4/Auth_with_ldap.pm @@ -478,6 +478,7 @@ C4::Auth - Authenticates Koha users | contactfirstname | text | YES | | NULL | | | contacttitle | text | YES | | NULL | | | borrowernotes | mediumtext | YES | | NULL | | + | relationship | varchar(100) | YES | | NULL | | | ethnicity | varchar(50) | YES | | NULL | | | ethnotes | varchar(255) | YES | | NULL | | | sex | varchar(1) | YES | | NULL | | diff --git a/C4/SIP/ILS/Patron.pm b/C4/SIP/ILS/Patron.pm index b72128d7ab..d5ac629023 100644 --- a/C4/SIP/ILS/Patron.pm +++ b/C4/SIP/ILS/Patron.pm @@ -690,6 +690,7 @@ __END__ | contactfirstname | text | YES | | NULL | | | contacttitle | text | YES | | NULL | | | borrowernotes | mediumtext | YES | | NULL | | +| relationship | varchar(100) | YES | | NULL | | | ethnicity | varchar(50) | YES | | NULL | | | ethnotes | varchar(255) | YES | | NULL | | | sex | varchar(1) | YES | | NULL | | diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index e9b12d6898..6279db8c94 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -1283,6 +1283,7 @@ CREATE TABLE `borrower_modifications` ( `contactfirstname` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL, `contacttitle` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL, `borrowernotes` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `relationship` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `sex` varchar(1) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `password` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `flags` int(11) DEFAULT NULL, @@ -1399,6 +1400,7 @@ CREATE TABLE `borrowers` ( `contactfirstname` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'used for children to include first name of guarantor', `contacttitle` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'used for children to include title (Mr., Mrs., etc) of guarantor', `borrowernotes` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'a note on the patron/borrower''s account that is only visible in the staff interface', + `relationship` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'used for children to include the relationship to their guarantor', `sex` varchar(1) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s gender', `password` varchar(60) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s Bcrypt encrypted password', `flags` int(11) DEFAULT NULL COMMENT 'will include a number associated with the staff member''s permissions', @@ -2401,6 +2403,7 @@ CREATE TABLE `deletedborrowers` ( `contactfirstname` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'used for children to include first name of guarantor', `contacttitle` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'used for children to include title (Mr., Mrs., etc) of guarantor', `borrowernotes` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'a note on the patron/borrower''s account that is only visible in the staff interface', + `relationship` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'used for children to include the relationship to their guarantor', `sex` varchar(1) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s gender', `password` varchar(60) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s encrypted password', `flags` int(11) DEFAULT NULL COMMENT 'will include a number associated with the staff member''s permissions', -- 2.39.5