almost passes sybase tests now

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm b/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm
index 8d11c21..5151f21 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/MSSQL.pm
@@ -129,6 +129,10 @@ L<DBIx::Class::Schema::Loader::DBI>
 
 Justin Hunter C<justin.d.hunter@gmail.com>
 
+=head1 CONTRIBUTORS
+
+Rafael Kitover <rkitover@cpan.org>
+
 =cut
 
 1;

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm b/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
index 600eb77..7b3ec3d 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Sybase.pm
@@ -82,19 +82,41 @@ sub _table_pk_info {
 sub _table_fk_info {
     my ($self, $table) = @_;
 
-    my ($local_cols, $remote_cols, $remote_table, @rels);
-    my $dbh = $self->schema->storage->dbh;
+    # check if FK_NAME is supported
 
+    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] == 17461 ? 0 : 1 }; 
+    my $sth = $dbh->prepare(qq{sp_fkeys \@fktable_name = '$table'});
+    $sth->execute;
+    my $row = $sth->fetchrow_hashref;
+
+    return unless $row;
+
+    if (exists $row->{fk_name}) {
+        $sth->finish;
+        return $self->_table_fk_info_by_name($table);
+    }
+
+    $sth->finish;
+    return $self->_table_fk_info_builder($table);
+}
+
+sub _table_fk_info_by_name {
+    my ($self, $table) = @_;
+    my ($local_cols, $remote_cols, $remote_table, @rels);
 
+    my $dbh = $self->schema->storage->dbh;
+    local $dbh->{FetchHashKeyName} = 'NAME_lc';
     # hide "Object does not exist in this database." when trying to fetch fkeys
-    $dbh->{syb_err_handler} = sub { return 0 if $_[0] == 17461; }; 
+    local $dbh->{syb_err_handler} = sub { return $_[0] == 17461 ? 0 : 1 }; 
     my $sth = $dbh->prepare(qq{sp_fkeys \@fktable_name = '$table'});
     $sth->execute;
 
     while (my $row = $sth->fetchrow_hashref) {
-        my $fk = $row->{fk_name} ||
-'fk_'.$row->{fktable_name}.'_'.$row->{pktable_name};
+        my $fk = $row->{fk_name};
+        next unless defined $fk;
 
         push @{$local_cols->{$fk}}, $row->{fkcolumn_name};
         push @{$remote_cols->{$fk}}, $row->{pkcolumn_name};
@@ -112,12 +134,73 @@ sub _table_fk_info {
     return \@rels;
 }
 
+sub _table_fk_info_builder {
+    my ($self, $table) = @_;
+
+    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 = '$table'});
+    $sth->execute;
+
+    my @fk_info;
+    while (my $row = $sth->fetchrow_hashref) {
+        (my $ksq = $row->{key_seq}) =~ s/\s+//g;
+
+        my @keys = qw/pktable_name pkcolumn_name fktable_name fkcolumn_name/;
+        my %ds;
+        @ds{@keys}   = @{$row}{@keys};
+        $ds{key_seq} = $ksq;
+
+        push @{ $fk_info[$ksq] }, \%ds;
+    }
+
+    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
+            ];
+        }
+
+        while (1) {
+            my @rel = map shift @$_, @level_rels[1..$level];
+
+            last unless defined $rel[0];
+
+            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
+            };
+        }
+    }
+
+    return \@rels;
+}
+
 sub _table_uniq_info {
     my ($self, $table) = @_;
 
+    local $SIG{__WARN__} = sub {};
+
     my $dbh = $self->schema->storage->dbh;
+    local $dbh->{FetchHashKeyName} = 'NAME_lc';
     my $sth = $dbh->prepare(qq{sp_helpconstraint \@objname='$table', \@nomsg='nomsg'});
-    $sth->execute;
+    eval { $sth->execute };
+    return if $@;
 
     my $constraints;
     while (my $row = $sth->fetchrow_hashref) {
@@ -169,6 +252,10 @@ L<DBIx::Class::Schema::Loader::DBI>
 
 Justin Hunter C<justin.d.hunter@gmail.com>
 
+=head1 CONTRIBUTORS
+
+Rafael Kitover <rkitover@cpan.org>
+
 =cut
 
 1;