Merge 'trunk' into 'replication_dedux'

[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 2b28247..64bf9f1 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/Oracle.pm
+++ b/lib/DBIx/Class/Storage/DBI/Oracle.pm
@@ -1,4 +1,5 @@
 package DBIx::Class::Storage::DBI::Oracle;
+
 use strict;
 use warnings;
 
@@ -8,22 +9,35 @@ sub _rebless {
     my ($self) = @_;
 
     my $version = eval { $self->_dbh->get_info(18); };
-    unless ( $@ ) {
-        my ($major,$minor,$patchlevel) = split(/\./,$version);
 
-        # 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 $@;
     }
 }
 
+sub _svp_begin {
+    my ($self, $name) = @_;
+ 
+    $self->dbh->do("SAVEPOINT $name");
+}
+
+# Would've implemented _svp_release here, but Oracle doesn't support it.
+
+sub _svp_rollback {
+    my ($self, $name) = @_;
+
+    $self->dbh->do("ROLLBACK TO SAVEPOINT $name")
+}
 
 1;
 
@@ -39,8 +53,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