From 2ccf81dec1fbe4e215ea47700a4e006420318621 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Sun, 15 Mar 2015 13:50:28 +0100 Subject: Bug 902395: Enforce utf8 = true for all installations and remove the utf8 parameter r=dkl a=sgreen --- Bugzilla/DB/Oracle.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Bugzilla/DB/Oracle.pm') diff --git a/Bugzilla/DB/Oracle.pm b/Bugzilla/DB/Oracle.pm index 7424019ac..51678dec9 100644 --- a/Bugzilla/DB/Oracle.pm +++ b/Bugzilla/DB/Oracle.pm @@ -55,7 +55,7 @@ sub new { $dbname ||= Bugzilla->localconfig->{db_name}; # Set the language enviroment - $ENV{'NLS_LANG'} = '.AL32UTF8' if Bugzilla->params->{'utf8'}; + $ENV{'NLS_LANG'} = '.AL32UTF8'; # construct the DSN from the parameters we got my $dsn = "dbi:Oracle:host=$host;sid=$dbname"; @@ -74,8 +74,7 @@ sub new { # Set the session's default date format to match MySQL $self->do("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'"); $self->do("ALTER SESSION SET NLS_TIMESTAMP_FORMAT='YYYY-MM-DD HH24:MI:SS'"); - $self->do("ALTER SESSION SET NLS_LENGTH_SEMANTICS='CHAR'") - if Bugzilla->params->{'utf8'}; + $self->do("ALTER SESSION SET NLS_LENGTH_SEMANTICS='CHAR'"); # To allow case insensitive query. $self->do("ALTER SESSION SET NLS_COMP='ANSI'"); $self->do("ALTER SESSION SET NLS_SORT='BINARY_AI'"); -- cgit v1.2.3-24-g4f1b