Skip to content

Fix a regression from the MariaDB change that broke course archival procedures if the DBD:mysql driver is used #1284

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

Merged
taniwallach merged 2 commits into from
Mar 30, 2021
Merged

Fix a regression from the MariaDB change that broke course archival procedures if the DBD:mysql driver is used #1284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f87a9e
Fix course archival procedures (or anything that calls _get_db_info in
drgrice1 Mar 24, 2021
3ba4640
Switch to a new more versatile method of dns parsing (that is actually
drgrice1 Mar 25, 2021
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
27 changes: 15 additions & 12 deletions lib/WeBWorK/DB/Schema/NewSQL/Std.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,22 +271,25 @@ sub _get_db_info {
my $password = $self->{params}{password};

my %dsn;
if ( $dsn =~ m/^dbi:mariadb:/i ) {
if ($dsn =~ m/^dbi:mariadb:/i || $dsn =~ m/^dbi:mysql:/i) {
# Expect DBI:MariaDB:database=webwork;host=db;port=3306
my ($dbi,$dbtype,$temp1) = split(':',$dsn);
( $dsn{database}, $dsn{host}, $dsn{port} ) = split(';',$temp1);
$dsn{database} =~ s/database=//;
$dsn{host} =~ s/host=// if ( defined $dsn{host} );
$dsn{port} =~ s/port=// if ( defined $dsn{port} );
} elsif ( $dsn =~ m/^dbi:mysql:/i ) {
# This code works for DBD::mysql
# this is an internal function which we probably shouldn't be using here
# but it's quick and gets us what we want (FIXME what about sockets, etc?)
DBD::mysql->_OdbcParse($dsn, \%dsn, ['database', 'host', 'port']);
# or DBI:mysql:database=webwork;host=db;port=3306
# The host and port are optional.
my ($dbi, $dbtype, $dsn_opts) = split(':', $dsn);
while (length($dsn_opts)) {
if ($dsn_opts =~ /^([^=]*)=([^;]*);(.*)$/) {
$dsn{$1} = $2;
$dsn_opts = $3;
} else {
my ($var, $val) = $dsn_opts =~ /^([^=]*)=([^;]*)$/;
$dsn{$var} = $val;
$dsn_opts = '';
}
}
} else {
die "Can't call dump_table or restore_table on a table with a non-MySQL/MariaDB source";
}

die "no database specified in DSN!" unless defined $dsn{database};

my $mysqldump = $self->{params}{mysqldump_path};
Expand Down
27 changes: 15 additions & 12 deletions lib/WeBWorK/Utils/CourseManagement/sql_single.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,18 +197,21 @@ sub _get_db_info {
my $password = $ce->{database_password};

my %dsn;
if ( $dsn =~ s/^dbi:mariadb://i ) {
my ($dbi,$dbtype,$temp1) = split(':',$dsn);
( $dsn{database}, $dsn{host}, $dsn{port} ) = split(';',$db);
$dsn{database} =~ s/database=//;
$dsn{host} =~ s/host=// if ( defined $dsn{host} );
$dsn{port} =~ s/port=// if ( defined $dsn{port} );
} elsif ( $dsn =~ s/^dbi:mysql://i ) {
# This code works for DBD::mysql
# this is an internal function which we probably shouldn't be using here
# but it's quick and gets us what we want (FIXME what about sockets, etc?)
runtime_use "DBD::mysql";
DBD::mysql->_OdbcParse($dsn, \%dsn, ['database', 'host', 'port']);
if ($dsn =~ m/^dbi:mariadb:/i || $dsn =~ m/^dbi:mysql:/i) {
# Expect DBI:MariaDB:database=webwork;host=db;port=3306
# or DBI:mysql:database=webwork;host=db;port=3306
# The host and port are optional.
my ($dbi, $dbtype, $dsn_opts) = split(':', $dsn);
while (length($dsn_opts)) {
if ($dsn_opts =~ /^([^=]*)=([^;]*);(.*)$/) {
$dsn{$1} = $2;
$dsn_opts = $3;
} else {
my ($var, $val) = $dsn_opts =~ /^([^=]*)=([^;]*)$/;
$dsn{$var} = $val;
$dsn_opts = '';
}
}
} else {
die "Can't call dump_table or restore_table on a table with a non-MySQL/MariaDB source";
}
Expand Down