X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FOracle.pm;h=b977ec6be7ed5326989f4908b4df4ca356bbf20c;hb=52b420dd006f55aced42c669f49182890b8826ea;hp=f8f981b795776860f57c9222b5cd769b38a4448e;hpb=d40080c39809e75e0aa8b949ea157e274db1b66d;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI/Oracle.pm b/lib/DBIx/Class/Storage/DBI/Oracle.pm index f8f981b..b977ec6 100644 --- a/lib/DBIx/Class/Storage/DBI/Oracle.pm +++ b/lib/DBIx/Class/Storage/DBI/Oracle.pm @@ -4,25 +4,25 @@ use strict; use warnings; use base qw/DBIx::Class::Storage::DBI/; +use mro 'c3'; +use Try::Tiny; sub _rebless { my ($self) = @_; - my $version = eval { $self->dbh->get_info(18); }; + try { + my $version = $self->_get_dbh->get_info(18); - if ( !$@ ) { - my ($major, $minor, $patchlevel) = split(/\./, $version); + my ($major, $minor, $patchlevel) = split(/\./, $version); - # Default driver - my $class = $major <= 8 - ? 'DBIx::Class::Storage::DBI::Oracle::WhereJoins' - : 'DBIx::Class::Storage::DBI::Oracle::Generic'; + # Default driver + my $class = $major <= 8 + ? 'DBIx::Class::Storage::DBI::Oracle::WhereJoins' + : 'DBIx::Class::Storage::DBI::Oracle::Generic'; - # Load and rebless - eval "require $class"; - - bless $self, $class unless $@; - } + $self->ensure_class_loaded ($class); + bless $self, $class; + }; } 1; @@ -31,11 +31,6 @@ sub _rebless { DBIx::Class::Storage::DBI::Oracle - Base class for Oracle driver -=head1 SYNOPSIS - - # In your table classes - __PACKAGE__->load_components(qw/Core/); - =head1 DESCRIPTION This class simply provides a mechanism for discovering and loading a sub-class