X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FDB2.pm;h=ff6cb36b105bfa4904ef23a8766353e8892332c6;hb=900628605efdbced5dcfdbbab0022b204aa93e14;hp=eee55bb4990f660c7e80db8d06aeecfaf4bee742;hpb=6bb8fa3c45e71b384cd8217753152fd13381431a;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm b/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm
index eee55bb..ff6cb36 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/DB2.pm
@@ -8,12 +8,12 @@ use base qw/
 /;
 use mro 'c3';
 
-use List::MoreUtils 'any';
+use List::Util 'any';
 use namespace::clean;
 
 use DBIx::Class::Schema::Loader::Table ();
 
-our $VERSION = '0.07013';
+our $VERSION = '0.07044';
 
 =head1 NAME
 
@@ -75,14 +75,14 @@ EOF
         my ($col, $constname, $seq) = @$row;
         push(@{$keydata{$constname}}, [ $seq, $self->_lc($col) ]);
     }
-    foreach my $keyname (keys %keydata) {
+    foreach my $keyname (sort keys %keydata) {
         my @ordered_cols = map { $_->[1] } sort { $a->[0] <=> $b->[0] }
             @{$keydata{$keyname}};
         push(@uniqs, [ $keyname => \@ordered_cols ]);
     }
 
     $sth->finish;
-    
+
     return \@uniqs;
 }
 
@@ -91,7 +91,8 @@ sub _table_fk_info {
 
     my $sth = $self->{_cache}->{db2_fk} ||= $self->dbh->prepare(<<'EOF');
 SELECT tc.constname, sr.reftabschema, sr.reftabname,
-       kcu.colname, rkcu.colname, kcu.colseq
+       kcu.colname, rkcu.colname, kcu.colseq,
+       sr.deleterule, sr.updaterule
 FROM syscat.tabconst tc
 JOIN syscat.keycoluse kcu
     ON tc.constname = kcu.constname
@@ -103,6 +104,8 @@ JOIN syscat.references sr
         AND tc.tabname = sr.tabname
 JOIN syscat.keycoluse rkcu
     ON sr.refkeyname = rkcu.constname
+        AND sr.reftabschema = rkcu.tabschema
+        AND sr.reftabname = rkcu.tabname
         AND kcu.colseq = rkcu.colseq
 WHERE tc.tabschema = ?
     AND tc.tabname = ?
@@ -112,9 +115,16 @@ EOF
 
     my %rels;
 
+    my %rules = (
+        A => 'NO ACTION',
+        C => 'CASCADE',
+        N => 'SET NULL',
+        R => 'RESTRICT',
+    );
+
     COLS: while (my @row = $sth->fetchrow_array) {
         my ($fk, $remote_schema, $remote_table, $local_col, $remote_col,
-            $colseq) = @row;
+            $colseq, $delete_rule, $update_rule) = @row;
 
         if (not exists $rels{$fk}) {
             if ($self->db_schema && $self->db_schema->[0] ne '%'
@@ -132,17 +142,34 @@ EOF
 
         $rels{$fk}{local_columns}[$colseq-1]  = $self->_lc($local_col);
         $rels{$fk}{remote_columns}[$colseq-1] = $self->_lc($remote_col);
+
+        $rels{$fk}{attrs} ||= {
+            on_delete     => $rules{$delete_rule},
+            on_update     => $rules{$update_rule},
+            is_deferrable => 1, # DB2 has no deferrable constraints
+        };
     }
 
     return [ values %rels ];
 }
 
 
-# DBD::DB2 doesn't follow the DBI API for ->tables
+# DBD::DB2 doesn't follow the DBI API for ->tables (pre 1.85), but since its
+# backwards compatible we don't change it.
+# DBD::DB2 1.85 and beyond default TABLE_NAME to '', previously defaulted to
+# '%'. so we supply it.
 sub _dbh_tables {
     my ($self, $schema) = @_;
 
-    return $self->dbh->tables($schema ? { TABLE_SCHEM => $schema } : undef);
+    return $self->dbh->tables($schema ? { TABLE_SCHEM => $schema, TABLE_NAME => '%' } : undef);
+}
+
+sub _dbh_table_info {
+    my $self = shift;
+
+    local $^W = 0; # shut up undef warning from DBD::DB2
+
+    $self->next::method(@_);
 }
 
 sub _columns_info_for {
@@ -232,9 +259,9 @@ EOF
 L<DBIx::Class::Schema::Loader>, L<DBIx::Class::Schema::Loader::Base>,
 L<DBIx::Class::Schema::Loader::DBI>
 
-=head1 AUTHOR
+=head1 AUTHORS
 
-See L<DBIx::Class::Schema::Loader/AUTHOR> and L<DBIx::Class::Schema::Loader/CONTRIBUTORS>.
+See L<DBIx::Class::Schema::Loader/AUTHORS>.
 
 =head1 LICENSE