Try::Tiny conversion finished

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Storage / DBI / Oracle.pm

diff --git a/lib/DBIx/Class/Storage/DBI/Oracle.pm b/lib/DBIx/Class/Storage/DBI/Oracle.pm
index 4d289af..b977ec6 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/Oracle.pm
+++ b/lib/DBIx/Class/Storage/DBI/Oracle.pm
@@ -1,48 +1,49 @@
 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';
+use Try::Tiny;
 
 sub _rebless {
-  my ($self) = @_;
+    my ($self) = @_;
 
-  my $version = eval { $self->_dbh->get_info(18); };
-  unless ( $@ ) {
-    my ($major,$minor,$patchlevel) = split(/\./,$version);
+    try {
+      my $version = $self->_get_dbh->get_info(18);
 
-    # Default driver
-    my $class = "DBIx::Class::Storage::DBI::Oracle::Generic";
+      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 $@;
-  }
+      $self->ensure_class_loaded ($class);
+      bless $self, $class;
+    };
 }
 
-
 1;
 
 =head1 NAME
 
 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
-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