use namespace::clean w/ Try::Tiny

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

diff --git a/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm b/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm
index 9e72eae..933de9d 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm
+++ b/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm
@@ -5,6 +5,7 @@ use warnings;
 use Scope::Guard ();
 use Context::Preserve ();
 use Try::Tiny;
+use namespace::clean;
 
 =head1 NAME
 
@@ -125,10 +126,10 @@ sub _dbh_execute {
   my $self = shift;
   my ($dbh, $op, $extra_bind, $ident, $bind_attributes, @args) = @_;
 
-  my (@res, $retried);
+  my (@res, $tried);
   my $wantarray = wantarray();
   my $next = $self->next::can;
-  while (1) {
+  do {
     try {
       my $exec = sub { $self->$next($dbh, $op, $extra_bind, $ident, $bind_attributes, @args) };
 
@@ -141,9 +142,11 @@ sub _dbh_execute {
       else {
         @res = $exec->();
       }
+
+      $tried++;
     }
     catch {
-      if (!$retried++ and $_ =~ /ORA-01003/) {
+      if (! $tried and $_ =~ /ORA-01003/) {
         # ORA-01003: no statement parsed (someone changed the table somehow,
         # invalidating your cursor.)
         my ($sql, $bind) = $self->_prep_for_execute($op, $extra_bind, $ident, \@args);
@@ -153,7 +156,7 @@ sub _dbh_execute {
         $self->throw_exception($_);
       }
     };
-  }
+  } while (! $tried++);
 
   return $wantarray ? @res : $res[0];
 }
@@ -353,7 +356,7 @@ sub with_deferred_fk_checks {
   my $txn_scope_guard = $self->txn_scope_guard;
 
   $self->_do_query('alter session set constraints = deferred');
-  
+
   my $sg = Scope::Guard->new(sub {
     $self->_do_query('alter session set constraints = immediate');
   });