X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FOracle.pm;h=399eb70d8f72798956b48e881a008a6118767d2b;hb=4225194590a09e29451ba825c34483f98c1a0c03;hp=c0edb9a3ae28efdefae2687e43135821bf68843d;hpb=a52c8b220cc34804bf227aea8682aec7c0f10b99;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI/Oracle.pm b/lib/DBIx/Class/Storage/DBI/Oracle.pm index c0edb9a..399eb70 100644 --- a/lib/DBIx/Class/Storage/DBI/Oracle.pm +++ b/lib/DBIx/Class/Storage/DBI/Oracle.pm @@ -9,7 +9,7 @@ use mro 'c3'; sub _rebless { my ($self) = @_; - my $version = eval { $self->last_dbh->get_info(18); }; + my $version = eval { $self->_get_dbh->get_info(18); }; if ( !$@ ) { my ($major, $minor, $patchlevel) = split(/\./, $version); @@ -19,10 +19,8 @@ sub _rebless { ? '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; } } @@ -32,11 +30,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