Bug 23049: (follow-up) Types should not be deletable

[koha-ffzg.git] / Koha / Database.pm

diff --git a/Koha/Database.pm b/Koha/Database.pm
index 1502364..c04c609 100644 (file)
--- a/Koha/Database.pm
+++ b/Koha/Database.pm
@@ -58,13 +58,29 @@ sub _new_schema {
     my $db_port   = $context->config("port") || '';
     my $db_user   = $context->config("user");
     my $db_passwd = $context->config("pass");
+    my $tls = $context->config("tls");
+    my $tls_options;
+    if( $tls && $tls eq 'yes' ) {
+        my $ca = $context->config('ca');
+        my $cert = $context->config('cert');
+        my $key = $context->config('key');
+        $tls_options = ";mysql_ssl=1;mysql_ssl_client_key=".$key.";mysql_ssl_client_cert=".$cert.";mysql_ssl_ca_file=".$ca;
+    }
+
 
-    my ( %encoding_attr, $encoding_query, $tz_query );
-    my $tz = $ENV{TZ};
+
+    my ( %encoding_attr, $encoding_query, $tz_query, $sql_mode_query );
+    my $tz = C4::Context->timezone;
+    $tz = q{} if ( $tz eq 'local' );
     if ( $db_driver eq 'mysql' ) {
         %encoding_attr = ( mysql_enable_utf8 => 1 );
-        $encoding_query = "set NAMES 'utf8'";
+        $encoding_query = "set NAMES 'utf8mb4'";
         $tz_query = qq(SET time_zone = "$tz") if $tz;
+        if ( ( exists $ENV{_} && $ENV{_} =~ m|prove| ) or C4::Context->config('strict_sql_modes') ) {
+            $sql_mode_query = q{SET sql_mode = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION'};
+        } else {
+            $sql_mode_query = q{SET sql_mode = 'IGNORE_SPACE,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION'};
+        }
     }
     elsif ( $db_driver eq 'Pg' ) {
         $encoding_query = "set client_encoding = 'UTF8';";
@@ -72,15 +88,18 @@ sub _new_schema {
     }
     my $schema = Koha::Schema->connect(
         {
-            dsn => "dbi:$db_driver:database=$db_name;host=$db_host;port=$db_port",
+            dsn => "dbi:$db_driver:database=$db_name;host=$db_host;port=$db_port".($tls_options? $tls_options : ""),
             user => $db_user,
             password => $db_passwd,
             %encoding_attr,
             RaiseError => $ENV{DEBUG} ? 1 : 0,
+            PrintError => 1,
             unsafe => 1,
+            quote_names => 1,
             on_connect_do => [
                 $encoding_query || (),
                 $tz_query || (),
+                $sql_mode_query || (),
             ]
         }
     );
@@ -88,6 +107,10 @@ sub _new_schema {
     my $dbh = $schema->storage->dbh;
     eval {
         $dbh->{RaiseError} = 1;
+        if ( $ENV{KOHA_DB_DO_NOT_RAISE_OR_PRINT_ERROR} ) {
+            $dbh->{RaiseError} = 0;
+            $dbh->{PrintError} = 0;
+        }
         $dbh->do(q|
             SELECT * FROM systempreferences WHERE 1 = 0 |
         );
@@ -115,13 +138,12 @@ possibly C<&set_schema>.
 
 sub schema {
     my $self = shift;
-    my $sth;
+    my $params = shift;
 
-    if ( defined( $database->{schema} ) and $database->{schema}->storage->connected() ) {
-        return $database->{schema};
+    unless ( $params->{new} ) {
+        return $database->{schema} if defined $database->{schema};
     }
 
-    # No database handle or it died . Create one.
     $database->{schema} = &_new_schema();
     return $database->{schema};
 }
@@ -200,6 +222,23 @@ sub restore_schema {
     # return something, then this function should, too.
 }
 
+=head2 get_schema_cached
+
+=cut
+
+sub get_schema_cached {
+    return $database->{schema};
+}
+
+=head2 flush_schema_cache
+
+=cut
+
+sub flush_schema_cache {
+    delete $database->{schema};
+    return 1;
+}
+
 =head2 EXPORT
 
 None by default.