Lines 321-327
sub load_sql_in_order {
Link Here
|
321 |
my $av_cat = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/mandatory/auth_val_cat.sql"; |
321 |
my $av_cat = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/mandatory/auth_val_cat.sql"; |
322 |
unshift(@fnames, $av_cat); |
322 |
unshift(@fnames, $av_cat); |
323 |
# Make sure the global sysprefs.sql file is loaded first |
323 |
# Make sure the global sysprefs.sql file is loaded first |
324 |
my $globalsysprefs = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/sysprefs.sql"; |
324 |
my $globalsysprefs = C4::Context->config('intranetdir') . "/installer/data/sysprefs.sql"; |
325 |
unshift(@fnames, $globalsysprefs); |
325 |
unshift(@fnames, $globalsysprefs); |
326 |
push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/userflags.sql"; |
326 |
push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/userflags.sql"; |
327 |
push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/userpermissions.sql"; |
327 |
push @fnames, C4::Context->config('intranetdir') . "/installer/data/mysql/userpermissions.sql"; |
Lines 331-336
sub load_sql_in_order {
Link Here
|
331 |
# warn $file; |
331 |
# warn $file; |
332 |
undef $/; |
332 |
undef $/; |
333 |
my $error = $self->load_sql($file); |
333 |
my $error = $self->load_sql($file); |
|
|
334 |
warn "==="; |
335 |
use Data::Printer colored => 1; warn p $error; |
336 |
warn "==="; |
334 |
my @file = split qr(\/|\\), $file; |
337 |
my @file = split qr(\/|\\), $file; |
335 |
$lang = $file[ scalar(@file) - 3 ] unless ($lang); |
338 |
$lang = $file[ scalar(@file) - 3 ] unless ($lang); |
336 |
my $level = $file[ scalar(@file) - 2 ]; |
339 |
my $level = $file[ scalar(@file) - 2 ]; |
Lines 447-458
sub load_sql {
Link Here
|
447 |
|
450 |
|
448 |
my $dbh = $self->{ dbh }; |
451 |
my $dbh = $self->{ dbh }; |
449 |
|
452 |
|
450 |
my $dup_stderr; |
453 |
my ( $dup_stderr, $nb_errors ); |
451 |
do { |
454 |
do { |
452 |
local *STDERR; |
455 |
local *STDERR; |
453 |
open STDERR, ">>", \$dup_stderr; |
456 |
open STDERR, ">>", \$dup_stderr; |
454 |
|
457 |
|
455 |
eval { |
458 |
$nb_errors = eval { |
456 |
DBIx::RunSQL->run_sql_file( |
459 |
DBIx::RunSQL->run_sql_file( |
457 |
dbh => $dbh, |
460 |
dbh => $dbh, |
458 |
sql => $filename, |
461 |
sql => $filename, |
Lines 460-471
sub load_sql {
Link Here
|
460 |
}; |
463 |
}; |
461 |
}; |
464 |
}; |
462 |
# errors thrown while loading installer data should be logged |
465 |
# errors thrown while loading installer data should be logged |
463 |
if( $dup_stderr ) { |
466 |
warn "found $nb_errors errors"; |
|
|
467 |
if( $nb_errors ) { |
464 |
warn "C4::Installer::load_sql returned the following errors while attempting to load $filename:\n"; |
468 |
warn "C4::Installer::load_sql returned the following errors while attempting to load $filename:\n"; |
465 |
$error = $dup_stderr; |
469 |
$error = $dup_stderr; |
466 |
} |
470 |
} |
467 |
|
471 |
|
468 |
return $error; |
472 |
return $nb_errors ? $error : undef; |
469 |
} |
473 |
} |
470 |
|
474 |
|
471 |
=head2 get_file_path_from_name |
475 |
=head2 get_file_path_from_name |
472 |
- |
|
|