Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 28786: (QA follow-up) Upgrade atomicupdate to new style

Browse source 
Test plan:
Run dbrev again.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Marcel de Rooy 2021-12-21 15:07:56 +00:00 committed by Fridolin Somers
parent 90971d01ed
commit f03e2689d6
2 changed files with 39 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
installer/data/mysql/atomicupdate/two-fa.perl
View file

@ -1,34 +0,0 @@
$DBversion = 'XXX'; # will be replaced by the RM
if( CheckVersion( $DBversion ) ) {
$dbh->do(q{
INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
('TwoFactorAuthentication', '0', 'NULL', 'Enables two-factor authentication', 'YesNo')
});
if( !column_exists( 'borrowers', 'secret' ) ) {
$dbh->do(q{
ALTER TABLE borrowers ADD COLUMN `secret` MEDIUMTEXT COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Secret for 2FA' AFTER `password`
});
}
if( !column_exists( 'deletedborrowers', 'secret' ) ) {
$dbh->do(q{
ALTER TABLE deletedborrowers ADD COLUMN `secret` MEDIUMTEXT COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Secret for 2FA' AFTER `password`
});
}
if( !column_exists( 'borrowers', 'auth_method' ) ) {
$dbh->do(q{
ALTER TABLE borrowers ADD COLUMN `auth_method` ENUM('password', 'two-factor') NOT NULL DEFAULT 'password' COMMENT 'Authentication method' AFTER `secret`
});
}
if( !column_exists( 'deletedborrowers', 'auth_method' ) ) {
$dbh->do(q{
ALTER TABLE deletedborrowers ADD COLUMN `auth_method` ENUM('password', 'two-factor') NOT NULL DEFAULT 'password' COMMENT 'Authentication method' AFTER `secret`
});
}
NewVersion( $DBversion, 28786, "Add new syspref TwoFactorAuthentication");
}

39
installer/data/mysql/atomicupdate/two-fa.pl Executable file
View file

@ -0,0 +1,39 @@
use Modern::Perl;
return {
bug_number => 28786,
description => "Add syspref TwoFactorAuthentication, fields secret and auth_method",
up => sub {
my ($args) = @_;
my ($dbh, $out) = @$args{qw(dbh out)};
$dbh->do(q{
INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
('TwoFactorAuthentication', '0', 'NULL', 'Enables two-factor authentication', 'YesNo')
});
if( !column_exists( 'borrowers', 'secret' ) ) {
$dbh->do(q{
ALTER TABLE borrowers ADD COLUMN `secret` MEDIUMTEXT COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Secret for 2FA' AFTER `password`
});
}
if( !column_exists( 'deletedborrowers', 'secret' ) ) {
$dbh->do(q{
ALTER TABLE deletedborrowers ADD COLUMN `secret` MEDIUMTEXT COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Secret for 2FA' AFTER `password`
});
}
if( !column_exists( 'borrowers', 'auth_method' ) ) {
$dbh->do(q{
ALTER TABLE borrowers ADD COLUMN `auth_method` ENUM('password', 'two-factor') NOT NULL DEFAULT 'password' COMMENT 'Authentication method' AFTER `secret`
});
}
if( !column_exists( 'deletedborrowers', 'auth_method' ) ) {
$dbh->do(q{
ALTER TABLE deletedborrowers ADD COLUMN `auth_method` ENUM('password', 'two-factor') NOT NULL DEFAULT 'password' COMMENT 'Authentication method' AFTER `secret`
});
}
},
};