fix column info bug, all tests pass

[dbsrgits/DBIx-Class-Schema-Loader.git] / lib / DBIx / Class / Schema / Loader / DBI.pm

diff --git a/lib/DBIx/Class/Schema/Loader/DBI.pm b/lib/DBIx/Class/Schema/Loader/DBI.pm
index b23023a..8946c99 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/DBI.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI.pm
@@ -124,7 +124,7 @@ sub _filter_tables {
     @tables = grep { /$constraint/ } @$tables if defined $constraint;
     @tables = grep { ! /$exclude/  } @$tables if defined $exclude;
 
-    for my $table (@tables) {
+    LOOP: for my $table (@tables) {
         try {
             my $sth = $self->_sth_for($table, undef, \'1 = 0');
             $sth->execute;
@@ -132,6 +132,8 @@ sub _filter_tables {
         catch {
             warn "Bad table or view '$table', ignoring: $_\n";
             $self->_unregister_source_for_table($table);
+            no warnings 'exiting';
+            next LOOP;
         };
 
         push @filtered_tables, $table;
@@ -322,7 +324,7 @@ sub _columns_info_for {
     my $sth = $self->_sth_for($table, undef, \'1 = 0');
     $sth->execute;
 
-    my @columns = $sth->{NAME};
+    my @columns = @{ $sth->{NAME} };
 
     for my $i (0 .. $#columns) {
         my $column_info = {};