[Bast-commits] r9429 - in DBIx-Class/0.08/branches/oracle_returning: . lib/DBIx/Class/Storage/DBI

[abraxxa at dev.catalyst.perl.org]

Author: abraxxa
Date: 2010-05-25 16:55:26 +0100 (Tue, 25 May 2010)
New Revision: 9429

Modified:
   DBIx-Class/0.08/branches/oracle_returning/Changes
   DBIx-Class/0.08/branches/oracle_returning/lib/DBIx/Class/Storage/DBI/Oracle.pm
Log:
use _server_info in Storage::DBI::Oracle


Modified: DBIx-Class/0.08/branches/oracle_returning/Changes
===================================================================
--- DBIx-Class/0.08/branches/oracle_returning/Changes	2010-05-25 15:49:27 UTC (rev 9428)
+++ DBIx-Class/0.08/branches/oracle_returning/Changes	2010-05-25 15:55:26 UTC (rev 9429)
@@ -30,6 +30,7 @@
           if there are no dirty columns to update (fixes cascaded update
           annoyances)
         - Update Schema::Versioned to respect hashref style of connection_info
+        - use _server_info in Storage::DBI::Oracle
 
 0.08121 2010-04-11 18:43:00 (UTC)
         - Support for Firebird RDBMS with DBD::InterBase and ODBC

Modified: DBIx-Class/0.08/branches/oracle_returning/lib/DBIx/Class/Storage/DBI/Oracle.pm
===================================================================
--- DBIx-Class/0.08/branches/oracle_returning/lib/DBIx/Class/Storage/DBI/Oracle.pm	2010-05-25 15:49:27 UTC (rev 9428)
+++ DBIx-Class/0.08/branches/oracle_returning/lib/DBIx/Class/Storage/DBI/Oracle.pm	2010-05-25 15:55:26 UTC (rev 9429)
@@ -8,20 +8,14 @@
 
 sub _rebless {
     my ($self) = @_;
+    
+    # Default driver
+    my $class = $self->_server_info->{normalized_dbms_version} <= 8
+        ? 'DBIx::Class::Storage::DBI::Oracle::WhereJoins'
+        : 'DBIx::Class::Storage::DBI::Oracle::Generic';
 
-    my $version = eval { $self->_get_dbh->get_info(18); };
-
-    if ( !$@ ) {
-        my ($major, $minor, $patchlevel) = split(/\./, $version);
-
-        # Default driver
-        my $class = $major <= 8
-          ? 'DBIx::Class::Storage::DBI::Oracle::WhereJoins'
-          : 'DBIx::Class::Storage::DBI::Oracle::Generic';
-
-        $self->ensure_class_loaded ($class);
-        bless $self, $class;
-    }
+    $self->ensure_class_loaded ($class);
+    bless $self, $class;
 }
 
 1;