X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI.pm;h=cc8f0bb32b26e0393c67dc7fca1e5fdce2c07d2d;hb=c8845f2e67c636fbfb597a4562847cc80c4e5f28;hp=b23023ab4a424b1f7d0c247612cb2172bce46347;hpb=61d1cca103b4dc4dbbdfa0ee2b402eb619be644d;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/DBI.pm b/lib/DBIx/Class/Schema/Loader/DBI.pm
index b23023a..cc8f0bb 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI.pm
@@ -8,7 +8,14 @@ use Carp::Clan qw/^DBIx::Class/;
 use Try::Tiny;
 use namespace::clean;
 
-our $VERSION = '0.07002';
+our $VERSION = '0.07009';
+
+__PACKAGE__->mk_group_accessors('simple', qw/
+    _disable_pk_detection
+    _disable_uniq_detection
+    _disable_fk_detection
+    _passwords
+/);
 
 =head1 NAME
 
@@ -124,14 +131,17 @@ 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 {
+            local $^W = 0; # for ADO
             my $sth = $self->_sth_for($table, undef, \'1 = 0');
             $sth->execute;
         }
         catch {
             warn "Bad table or view '$table', ignoring: $_\n";
             $self->_unregister_source_for_table($table);
+            no warnings 'exiting';
+            next LOOP;
         };
 
         push @filtered_tables, $table;
@@ -194,9 +204,22 @@ sub _table_columns {
 sub _table_pk_info { 
     my ($self, $table) = @_;
 
+    return [] if $self->_disable_pk_detection;
+
     my $dbh = $self->schema->storage->dbh;
 
-    my @primary = map { $self->_lc($_) } $dbh->primary_key('', $self->db_schema, $table);
+    my @primary = try {
+        $dbh->primary_key('', $self->db_schema, $table);
+    }
+    catch {
+        warn "Cannot find primary keys for this driver: $_";
+        $self->_disable_pk_detection(1);
+        return ();
+    };
+
+    return [] if not @primary;
+
+    @primary = map { $self->_lc($_) } @primary;
     s/\Q$self->{_quoter}\E//g for @primary;
 
     return \@primary;
@@ -206,9 +229,13 @@ sub _table_pk_info {
 sub _table_uniq_info {
     my ($self, $table) = @_;
 
+    return [] if $self->_disable_uniq_detection;
+
     my $dbh = $self->schema->storage->dbh;
-    if(!$dbh->can('statistics_info')) {
-        warn "No UNIQUE constraint information can be gathered for this vendor";
+
+    if (not $dbh->can('statistics_info')) {
+        warn "No UNIQUE constraint information can be gathered for this driver";
+        $self->_disable_uniq_detection(1);
         return [];
     }
 
@@ -223,17 +250,14 @@ sub _table_uniq_info {
             || !defined $row->{ORDINAL_POSITION}
             || !$row->{COLUMN_NAME};
 
-        $indices{$row->{INDEX_NAME}}->{$row->{ORDINAL_POSITION}} = $row->{COLUMN_NAME};
+        $indices{$row->{INDEX_NAME}}[$row->{ORDINAL_POSITION}] = $self->_lc($row->{COLUMN_NAME});
     }
     $sth->finish;
 
     my @retval;
     foreach my $index_name (keys %indices) {
         my $index = $indices{$index_name};
-        push(@retval, [ $index_name => [
-            map { $index->{$_} }
-                sort keys %$index
-        ]]);
+        push(@retval, [ $index_name => [ @$index[1..$#$index] ] ]);
     }
 
     return \@retval;
@@ -243,9 +267,19 @@ sub _table_uniq_info {
 sub _table_fk_info {
     my ($self, $table) = @_;
 
+    return [] if $self->_disable_fk_detection;
+
     my $dbh = $self->schema->storage->dbh;
-    my $sth = $dbh->foreign_key_info( '', $self->db_schema, '',
-                                      '', $self->db_schema, $table );
+    my $sth = try {
+        $dbh->foreign_key_info( '', $self->db_schema, '',
+                                '', $self->db_schema, $table );
+    }
+    catch {
+        warn "Cannot introspect relationships for this driver: $_";
+        $self->_disable_fk_detection(1);
+        return undef;
+    };
+
     return [] if !$sth;
 
     my %rels;
@@ -322,11 +356,11 @@ 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 = {};
-        $column_info->{data_type} = lc $sth->{TYPE}->[$i];
+        $column_info->{data_type} = lc $sth->{TYPE}[$i];
 
         my $size = $sth->{PRECISION}[$i];
 
@@ -337,7 +371,7 @@ sub _columns_info_for {
             $column_info->{size} = $size;
         }
 
-        $column_info->{is_nullable} = $sth->{NULLABLE}->[$i] ? 1 : 0;
+        $column_info->{is_nullable} = $sth->{NULLABLE}[$i] ? 1 : 0;
 
         if ($column_info->{data_type} =~ m/^(.*?)\((.*?)\)$/) {
             $column_info->{data_type} = $1;
@@ -355,7 +389,7 @@ sub _columns_info_for {
         my $colinfo = $result{$col};
         my $type_num = $colinfo->{data_type};
         my $type_name;
-        if (defined $type_num && $type_num =~ /^\d+\z/ && $dbh->can('type_info')) {
+        if (defined $type_num && $type_num =~ /^-?\d+\z/ && $dbh->can('type_info')) {
             my $type_info = $dbh->type_info($type_num);
             $type_name = $type_info->{TYPE_NAME} if $type_info;
             $colinfo->{data_type} = lc $type_name if $type_name;
@@ -375,6 +409,23 @@ sub _dbh_column_info {
     return $dbh->column_info(@_);
 }
 
+# If a coderef uses DBI->connect, this should get its connect info.
+sub _try_infer_connect_info_from_coderef {
+    my ($self, $code) = @_;
+
+    my ($dsn, $user, $pass, $params);
+
+    no warnings 'redefine';
+
+    local *DBI::connect = sub {
+        (undef, $dsn, $user, $pass, $params) = @_;
+    };
+
+    $code->();
+
+    return ($dsn, $user, $pass, $params);
+}
+
 =head1 SEE ALSO
 
 L<DBIx::Class::Schema::Loader>