Merge 'trunk' into 'DBIx-Class-current'

diff --cc lib/DBIx/Class/ResultSet.pm
Simple merge

diff --cc lib/DBIx/Class/ResultSource.pm
Simple merge

diff --cc lib/DBIx/Class/Storage/DBI/Oracle.pm
index 9c979ee,d5b605f..94df0e6
--- 1/lib/DBIx/Class/Storage/DBI/Oracle.pm
--- 2/lib/DBIx/Class/Storage/DBI/Oracle.pm
+++ b/lib/DBIx/Class/Storage/DBI/Oracle.pm
@@@ -27,20 -28,23 +27,27 @@@ sub get_autoinc_seq 
      AND t.triggering_event = 'INSERT'
      AND t.status = 'ENABLED'
    };
 -  # trigger_body is a LONG
 -  $dbh->{LongReadLen} = 64 * 1024 if ($dbh->{LongReadLen} < 64 * 1024);
 -  my $sth = $dbh->prepare($sql);
 -  $sth->execute( uc($source->name) );
 -  while (my ($insert_trigger) = $sth->fetchrow_array) {
 -    return uc($1) if $insert_trigger =~ m!(\w+)\.nextval!i; # col name goes here???
 -  }
 -  croak "Unable to find a sequence INSERT trigger on table '" . $source->name . "'.";
 +
 +  $self->dbh_do(sub {
 +    my $dbh = shift;
 +    # trigger_body is a LONG
 +    $dbh->{LongReadLen} = 64 * 1024 if ($dbh->{LongReadLen} < 64 * 1024);
 +    my $sth = $dbh->prepare($sql);
 +    $sth->execute( uc($source->name) );
 +    while (my ($insert_trigger) = $sth->fetchrow_array) {
 +      return uc($1) if $insert_trigger =~ m!(\w+)\.nextval!i; # col name goes here???
 +    }
 +    croak "Unable to find a sequence INSERT trigger on table '" . $source->name . "'.";
 +  });
  }
  
+ sub columns_info_for {
+   my ($self, $table) = @_;
+ 
+   $self->next::method($self, uc($table));
+ }
+ 
+ 
  1;
  
  =head1 NAME