View | Details | Raw Unified | Return to bug 26995
Collapse All | Expand All

(-)a/C4/Auth_with_ldap.pm (-1 lines)
Lines 475-481 C4::Auth - Authenticates Koha users Link Here
475
		| contactfirstname    | text         | YES  |     | NULL    |                |
475
		| contactfirstname    | text         | YES  |     | NULL    |                |
476
		| contacttitle        | text         | YES  |     | NULL    |                |
476
		| contacttitle        | text         | YES  |     | NULL    |                |
477
		| borrowernotes       | mediumtext   | YES  |     | NULL    |                |
477
		| borrowernotes       | mediumtext   | YES  |     | NULL    |                |
478
		| relationship        | varchar(100) | YES  |     | NULL    |                |
479
		| ethnicity           | varchar(50)  | YES  |     | NULL    |                |
478
		| ethnicity           | varchar(50)  | YES  |     | NULL    |                |
480
		| ethnotes            | varchar(255) | YES  |     | NULL    |                |
479
		| ethnotes            | varchar(255) | YES  |     | NULL    |                |
481
		| sex                 | varchar(1)   | YES  |     | NULL    |                |
480
		| sex                 | varchar(1)   | YES  |     | NULL    |                |
(-)a/C4/SIP/ILS/Patron.pm (-1 lines)
Lines 675-681 __END__ Link Here
675
| contactfirstname    | text         | YES  |     | NULL    |                |
675
| contactfirstname    | text         | YES  |     | NULL    |                |
676
| contacttitle        | text         | YES  |     | NULL    |                |
676
| contacttitle        | text         | YES  |     | NULL    |                |
677
| borrowernotes       | mediumtext   | YES  |     | NULL    |                |
677
| borrowernotes       | mediumtext   | YES  |     | NULL    |                |
678
| relationship        | varchar(100) | YES  |     | NULL    |                |
679
| ethnicity           | varchar(50)  | YES  |     | NULL    |                |
678
| ethnicity           | varchar(50)  | YES  |     | NULL    |                |
680
| ethnotes            | varchar(255) | YES  |     | NULL    |                |
679
| ethnotes            | varchar(255) | YES  |     | NULL    |                |
681
| sex                 | varchar(1)   | YES  |     | NULL    |                |
680
| sex                 | varchar(1)   | YES  |     | NULL    |                |
(-)a/installer/data/mysql/atomicupdate/bug_26995.perl (+23 lines)
Line 0 Link Here
1
$DBversion = 'XXX'; # will be replaced by the RM
2
if( CheckVersion( $DBversion ) ) {
3
    if ( !column_exists( 'borrowers', 'relationship' ) ) {
4
        $dbh->do(q{
5
            ALTER TABLE borrowers DROP COLUMN relationship
6
        });
7
    }
8
9
    if ( !column_exists( 'deletedborrowers', 'relationship' ) ) {
10
        $dbh->do(q{
11
            ALTER TABLE deletedborrowers DROP COLUMN relationship
12
        });
13
    }
14
15
    if ( !column_exists( 'borrower_modifications', 'relationship' ) ) {
16
        $dbh->do(q{
17
            ALTER TABLE borrower_modifications DROP COLUMN relationship
18
        });
19
    }
20
21
    # Always end with this (adjust the bug info)
22
    NewVersion( $DBversion, 26995, "Drop column relationship from borrower tables");
23
}
(-)a/installer/data/mysql/kohastructure.sql (-4 lines)
Lines 1282-1288 CREATE TABLE `borrower_modifications` ( Link Here
1282
  `contactfirstname` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL,
1282
  `contactfirstname` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL,
1283
  `contacttitle` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL,
1283
  `contacttitle` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL,
1284
  `borrowernotes` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL,
1284
  `borrowernotes` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL,
1285
  `relationship` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
1286
  `sex` varchar(1) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
1285
  `sex` varchar(1) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
1287
  `password` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
1286
  `password` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
1288
  `flags` int(11) DEFAULT NULL,
1287
  `flags` int(11) DEFAULT NULL,
Lines 1399-1405 CREATE TABLE `borrowers` ( Link Here
1399
  `contactfirstname` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'used for children to include first name of guarantor',
1398
  `contactfirstname` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'used for children to include first name of guarantor',
1400
  `contacttitle` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'used for children to include title (Mr., Mrs., etc) of guarantor',
1399
  `contacttitle` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'used for children to include title (Mr., Mrs., etc) of guarantor',
1401
  `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',
1400
  `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',
1402
  `relationship` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'used for children to include the relationship to their guarantor',
1403
  `sex` varchar(1) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s gender',
1401
  `sex` varchar(1) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s gender',
1404
  `password` varchar(60) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s Bcrypt encrypted password',
1402
  `password` varchar(60) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s Bcrypt encrypted password',
1405
  `flags` int(11) DEFAULT NULL COMMENT 'will include a number associated with the staff member''s permissions',
1403
  `flags` int(11) DEFAULT NULL COMMENT 'will include a number associated with the staff member''s permissions',
Lines 2398-2404 CREATE TABLE `deletedborrowers` ( Link Here
2398
  `contactfirstname` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'used for children to include first name of guarantor',
2396
  `contactfirstname` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'used for children to include first name of guarantor',
2399
  `contacttitle` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'used for children to include title (Mr., Mrs., etc) of guarantor',
2397
  `contacttitle` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'used for children to include title (Mr., Mrs., etc) of guarantor',
2400
  `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',
2398
  `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',
2401
  `relationship` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'used for children to include the relationship to their guarantor',
2402
  `sex` varchar(1) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s gender',
2399
  `sex` varchar(1) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s gender',
2403
  `password` varchar(60) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s encrypted password',
2400
  `password` varchar(60) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s encrypted password',
2404
  `flags` int(11) DEFAULT NULL COMMENT 'will include a number associated with the staff member''s permissions',
2401
  `flags` int(11) DEFAULT NULL COMMENT 'will include a number associated with the staff member''s permissions',
2405
- 

Return to bug 26995