Bug 29058: Add 'Always show holds' checkbox to request.pl

[koha-ffzg.git] / C4 / Installer.pm

diff --git a/C4/Installer.pm b/C4/Installer.pm
index 64698fd..ff9c2b1 100644 (file)
--- a/C4/Installer.pm
+++ b/C4/Installer.pm
@@ -73,7 +73,7 @@ sub new {
     my $self = {};
 
     # get basic information from context
-    $self->{'dbname'}   = C4::Context->config("database");
+    $self->{'dbname'}   = C4::Context->config("database_test") || C4::Context->config("database");
     $self->{'dbms'}     = C4::Context->config("db_scheme") ? C4::Context->config("db_scheme") : "mysql";
     $self->{'hostname'} = C4::Context->config("hostname");
     $self->{'port'}     = C4::Context->config("port");
@@ -364,7 +364,6 @@ sub load_sql_in_order {
     push @fnames, "$global_mandatory_dir/userflags.sql",
                   "$global_mandatory_dir/userpermissions.sql",
                   "$global_mandatory_dir/audio_alerts.sql",
-                  "$global_mandatory_dir/account_offset_types.sql",
                   "$global_mandatory_dir/account_credit_types.sql",
                   "$global_mandatory_dir/account_debit_types.sql",
                   ;
@@ -633,12 +632,15 @@ sub get_file_path_from_name {
 sub primary_key_exists {
     my ( $table_name, $key_name ) = @_;
     my $dbh = C4::Context->dbh;
-    my ($exists) = $dbh->selectrow_array(
-        qq|
-        SHOW INDEX FROM $table_name
-        WHERE key_name = 'PRIMARY' AND column_name = ?
-        |, undef, $key_name
-    );
+    my $sql = qq| SHOW INDEX FROM $table_name WHERE key_name='PRIMARY' |;
+    my $exists;
+    if( $key_name ){
+        $sql .= 'AND column_name = ? ' if $key_name;
+        ($exists) = $dbh->selectrow_array( $sql, undef, $key_name );
+    } else {
+        ($exists) = $dbh->selectrow_array( $sql, undef );
+    }
+
     return $exists;
 }