X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FSybase.pm;h=3d48a83e32e1abe2a986e519f99855a39ba8cdc2;hb=dc379dc68c7a7d620e16ee91c0c57a0b875081bd;hp=381972a83b04baf42caf97690a0b27bdf57544d2;hpb=3b71e53bd47bd29213e8fe12b3f9a2d1a229b587;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm b/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
index 381972a..3d48a83 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
@@ -6,7 +6,7 @@ use base 'DBIx::Class::Schema::Loader::DBI::Sybase::Common';
 use Carp::Clan qw/^DBIx::Class/;
 use mro 'c3';
 
-our $VERSION = '0.07007';
+our $VERSION = '0.07010';
 
 =head1 NAME
 
@@ -108,7 +108,7 @@ sub _table_fk_info {
     }
 
     $sth->finish;
-    return $self->_table_fk_info_builder($table);
+    return $self->_table_fk_info_by_sp_helpconstraint($table);
 }
 
 sub _table_fk_info_by_name {
@@ -142,58 +142,40 @@ sub _table_fk_info_by_name {
     return \@rels;
 }
 
-sub _table_fk_info_builder {
+sub _table_fk_info_by_sp_helpconstraint {
     my ($self, $table) = @_;
 
+    my $warn_handler = $SIG{__WARN__} || sub { warn @_ };
+    local $SIG{__WARN__} = sub {
+        $warn_handler->(@_) unless $_[0] =~
+            /^\s*$|^Total Number of|^Details|^(?:--?|=|\+) Number|^Formula for/;
+    };
+
     my $dbh = $self->schema->storage->dbh;
-    local $dbh->{FetchHashKeyName} = 'NAME_lc';
-    # hide "Object does not exist in this database." when trying to fetch fkeys
-    local $dbh->{syb_err_handler} = sub { return 0 if $_[0] == 17461; }; 
-    my $sth = $dbh->prepare(qq{sp_fkeys \@fktable_name = @{[ $dbh->quote($table) ]}});
-    $sth->execute;
 
-    my @fk_info;
-    while (my $row = $sth->fetchrow_hashref) {
-        (my $ksq = $row->{key_seq}) =~ s/\s+//g;
+    local $dbh->{FetchHashKeyName} = 'NAME_lc';
 
-        my @keys = qw/pktable_name pkcolumn_name fktable_name fkcolumn_name/;
-        my %ds;
-        @ds{@keys}   = @{$row}{@keys};
-        $ds{key_seq} = $ksq;
+    my $sth = $dbh->prepare("sp_helpconstraint $table");
+    $sth->execute;
 
-        push @{ $fk_info[$ksq] }, \%ds;
-    }
+    my $constraints = $sth->fetchall_arrayref({});
 
-    my $max_keys = $#fk_info;
     my @rels;
-    for my $level (reverse 1 .. $max_keys) {
-        my @level_rels;
-        $level_rels[$level] = splice @fk_info, $level, 1;
-        my $count = @{ $level_rels[$level] };
 
-        for my $sub_level (reverse 1 .. $level-1) {
-            my $total = @{ $fk_info[$sub_level] };
-
-            $level_rels[$sub_level] = [
-                splice @{ $fk_info[$sub_level] }, $total-$count, $count
-            ];
-        }
+    foreach my $constraint (map $_->{definition}, @$constraints) {
+        my ($local_cols, $remote_table, $remote_cols) = $constraint =~
+/^$table FOREIGN KEY \(([^)]+)\) REFERENCES ([^(]+)\(([^)]+)\)/;
 
-        while (1) {
-            my @rel = map shift @$_, @level_rels[1..$level];
+        next unless $local_cols;
 
-            last unless defined $rel[0];
+        my @local_cols  = split /,\s*/, $local_cols;
+        my @remote_cols = split /,\s*/, $remote_cols;
 
-            my @local_columns  = map $_->{fkcolumn_name}, @rel;
-            my @remote_columns = map $_->{pkcolumn_name}, @rel;
-            my $remote_table   = $rel[0]->{pktable_name};
-
-            push @rels, {
-                local_columns => \@local_columns,
-                remote_columns => \@remote_columns,
-                remote_table => $remote_table
-            };
-        }
+        push @rels, {
+            local_columns  => \@local_cols,
+            remote_columns => \@remote_cols,
+            remote_table   => $remote_table,
+        };
     }
 
     return \@rels;