X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FOracle.pm;fp=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FOracle.pm;h=ea956baed178435336a80939ff6a32db9e65d1c6;hb=9382ad0721370b25b9b93d78c76ecab0b46cc74e;hp=4d289af104bc5f91b50221929fc63b5af60f90f4;hpb=a439ec1916f46381937a97f49a04b06476147af1;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI/Oracle.pm b/lib/DBIx/Class/Storage/DBI/Oracle.pm index 4d289af..ea956ba 100644 --- a/lib/DBIx/Class/Storage/DBI/Oracle.pm +++ b/lib/DBIx/Class/Storage/DBI/Oracle.pm @@ -1,29 +1,35 @@ package DBIx::Class::Storage::DBI::Oracle; -# -*- mode: cperl; cperl-indent-level: 2 -*- use strict; use warnings; use base qw/DBIx::Class::Storage::DBI/; +print STDERR "Oracle.pm got called.\n"; + sub _rebless { - my ($self) = @_; + my ($self) = @_; + + print STDERR "Rebless got called.\n"; + + my $version = eval { $self->_dbh->get_info(18); }; + + if ( !$@ ) { + my ($major, $minor, $patchlevel) = split(/\./, $version); - my $version = eval { $self->_dbh->get_info(18); }; - unless ( $@ ) { - 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 = "DBIx::Class::Storage::DBI::Oracle::Generic"; + print STDERR "Class: $class\n"; - # Version specific drivers - $class = "DBIx::Class::Storage::DBI::Oracle::8" - if $major == 8; + # Load and rebless + eval "require $class"; - # Load and rebless - eval "require $class"; - bless $self, $class unless $@; - } + print STDERR "\$@: $@\n"; + bless $self, $class unless $@; + } }