gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 26995: Drop column relationship from borrowers, deletedborrowers and borrower_modifications tables 

Bug 14570 added a borrower_relationships table but it didn't remove the relationship column from the following tables:
- deletedborrowers
- borrowers
- borrower_modifications

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Kyle M Hall 2021-01-21 06:58:45 -05:00 committed by Jonathan Druart
parent dc09de362e
commit ca0e7541ec
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
C4/Auth_with_ldap.pm
View File

@ -474,7 +474,6 @@ 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 | |

1
C4/SIP/ILS/Patron.pm
View File

@ -690,7 +690,6 @@ __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 | |

23
installer/data/mysql/atomicupdate/bug_26995.perl Normal file
View File

@ -0,0 +1,23 @@
$DBversion = 'XXX'; # will be replaced by the RM
if( CheckVersion( $DBversion ) ) {
if ( !column_exists( 'borrowers', 'relationship' ) ) {
$dbh->do(q{
ALTER TABLE borrowers DROP COLUMN relationship
});
}
if ( !column_exists( 'deletedborrowers', 'relationship' ) ) {
$dbh->do(q{
ALTER TABLE deletedborrowers DROP COLUMN relationship
});
}
if ( !column_exists( 'borrower_modifications', 'relationship' ) ) {
$dbh->do(q{
ALTER TABLE borrower_modifications DROP COLUMN relationship
});
}
# Always end with this (adjust the bug info)
NewVersion( $DBversion, 26995, "Drop column relationship from borrower tables");
}

3
installer/data/mysql/kohastructure.sql
View File

@ -1283,7 +1283,6 @@ 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,
@ -1400,7 +1399,6 @@ 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',
@ -2402,7 +2400,6 @@ 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',