diff options
Diffstat (limited to 'rt/lib/RT/Handle.pm')
| -rw-r--r-- | rt/lib/RT/Handle.pm | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/rt/lib/RT/Handle.pm b/rt/lib/RT/Handle.pm index 21ca1ac..8d4563b 100644 --- a/rt/lib/RT/Handle.pm +++ b/rt/lib/RT/Handle.pm @@ -1,8 +1,8 @@ -# BEGIN BPS TAGGED BLOCK {{{ +# {{{ BEGIN BPS TAGGED BLOCK # # COPYRIGHT: # -# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC # <jesse@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -42,8 +42,7 @@ # works based on those contributions, and sublicense and distribute # those contributions and any derivatives thereof. # -# END BPS TAGGED BLOCK }}} - +# }}} END BPS TAGGED BLOCK =head1 NAME RT::Handle - RT's database handle @@ -90,9 +89,7 @@ sub Connect { my $self = shift; if ($RT::DatabaseType eq 'Oracle') { - $ENV{'NLS_LANG'} = "AMERICAN_AMERICA.AL32UTF8"; - $ENV{'NLS_NCHAR'} = "AL32UTF8"; - + $ENV{'NLS_LANG'} = ".UTF8"; } $self->SUPER::Connect( @@ -104,23 +101,19 @@ sub Connect { } -=head2 BuildDSN +=item BuildDSN Build the DSN for the RT database. doesn't take any parameters, draws all that from the config file. =cut -use File::Spec; sub BuildDSN { my $self = shift; # Unless the database port is a positive integer, we really don't want to pass it. $RT::DatabasePort = undef unless (defined $RT::DatabasePort && $RT::DatabasePort =~ /^(\d+)$/); $RT::DatabaseHost = undef unless (defined $RT::DatabaseHost && $RT::DatabaseHost ne ''); -$RT::DatabaseName = File::Spec->catfile($RT::VarPath, $RT::DatabaseName) - if ($RT::DatabaseType eq 'SQLite') and - not File::Spec->file_name_is_absolute($RT::DatabaseName); $self->SUPER::BuildDSN(Host => $RT::DatabaseHost, |