X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FOracle.pm;h=1bb9f798bea17fadf03c99ec5f901e359b5f29ae;hb=c70c716e091a7f4a0b9e4fc8dbbdc3d4b1841780;hp=4d289af104bc5f91b50221929fc63b5af60f90f4;hpb=e21dfd6a08cbef7df0ed57462cefb6ad0854fc09;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..1bb9f79 100644
--- a/lib/DBIx/Class/Storage/DBI/Oracle.pm
+++ b/lib/DBIx/Class/Storage/DBI/Oracle.pm
@@ -1,31 +1,30 @@
 package DBIx::Class::Storage::DBI::Oracle;
-# -*- mode: cperl; cperl-indent-level: 2 -*-
 
 use strict;
 use warnings;
 
 use base qw/DBIx::Class::Storage::DBI/;
+use mro 'c3';
 
 sub _rebless {
-  my ($self) = @_;
+    my ($self) = @_;
 
-  my $version = eval { $self->_dbh->get_info(18); };
-  unless ( $@ ) {
-    my ($major,$minor,$patchlevel) = split(/\./,$version);
+    my $version = eval { $self->dbh->get_info(18); };
 
-    # Default driver
-    my $class = "DBIx::Class::Storage::DBI::Oracle::Generic";
+    if ( !$@ ) {
+        my ($major, $minor, $patchlevel) = split(/\./, $version);
 
-    # Version specific drivers
-    $class = "DBIx::Class::Storage::DBI::Oracle::8"
-    if $major == 8;
+        # 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 $@;
-  }
-}
+        # Load and rebless
+        eval "require $class";
 
+        bless $self, $class unless $@;
+    }
+}
 
 1;
 
@@ -41,8 +40,16 @@ DBIx::Class::Storage::DBI::Oracle - Base class for Oracle driver
 =head1 DESCRIPTION
 
 This class simply provides a mechanism for discovering and loading a sub-class
-for a specific version Oracle backend.  It should be transparent to the user.
+for a specific version Oracle backend. It should be transparent to the user.
+
+For Oracle major versions <= 8 it loads the ::Oracle::WhereJoins subclass,
+which unrolls the ANSI join style DBIC normally generates into entries in
+the WHERE clause for compatibility purposes. To force usage of this version
+no matter the database version, add
+
+  __PACKAGE__->storage_type('::DBI::Oracle::WhereJoins');
 
+to your Schema class.
 
 =head1 AUTHORS