X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI.pm;h=90510e4f35cd8497442219c17daa0c2477b46387;hb=refs%2Ftags%2F0.07036_01;hp=c1d2aac4295698d377b477994ef465c46469740c;hpb=dec809869e443d2b09cb4d86835dadc489d1d116;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 c1d2aac..90510e4 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI.pm
@@ -10,7 +10,7 @@ use Carp::Clan qw/^DBIx::Class/;
 use namespace::clean;
 use DBIx::Class::Schema::Loader::Table ();
 
-our $VERSION = '0.07020';
+our $VERSION = '0.07036_01';
 
 __PACKAGE__->mk_group_accessors('simple', qw/
     _disable_pk_detection
@@ -61,7 +61,7 @@ sub new {
         }
     }
 
-    # Set up the default quoting character and name seperators
+    # Set up the default quoting character and name separators
     $self->quote_char($self->_build_quote_char);
     $self->name_sep($self->_build_name_sep);
 
@@ -119,7 +119,7 @@ sub _dbh_tables {
 sub _supports_db_schema { 1 }
 
 # Returns an array of table objects
-sub _tables_list { 
+sub _tables_list {
     my ($self, $opts) = (shift, shift);
 
     my @tables;
@@ -194,6 +194,40 @@ sub _tables_list {
     return $self->_filter_tables(\@tables, $opts);
 }
 
+sub _recurse_constraint {
+    my ($constraint, @parts) = @_;
+
+    my $name = shift @parts;
+
+    # If there are any parts left, the constraint must be an arrayref
+    croak "depth of constraint/exclude array does not match length of moniker_parts"
+        unless !!@parts == !!(ref $constraint eq 'ARRAY');
+
+    # if ths is the last part, use the constraint directly
+    return $name =~ $constraint unless @parts;
+
+    # recurse into the first matching subconstraint
+    foreach (@{$constraint}) {
+        my ($re, $sub) = @{$_};
+        return _recurse_constraint($sub, @parts)
+            if $name =~ $re;
+    }
+    return 0;
+}
+
+sub _check_constraint {
+    my ($include, $constraint, @tables) = @_;
+
+    return @tables unless defined $constraint;
+
+    return grep { !$include xor _recurse_constraint($constraint, @{$_}) } @tables
+        if ref $constraint eq 'ARRAY';
+
+    return grep { !$include xor /$constraint/ } @tables;
+}
+
+
+
 # apply constraint/exclude and ignore bad tables and views
 sub _filter_tables {
     my ($self, $tables, $opts) = @_;
@@ -202,11 +236,8 @@ sub _filter_tables {
     my @filtered_tables;
 
     $opts ||= {};
-    my $constraint   = $opts->{constraint};
-    my $exclude      = $opts->{exclude};
-
-    @tables = grep { /$constraint/ } @tables if defined $constraint;
-    @tables = grep { ! /$exclude/  } @tables if defined $exclude;
+    @tables = _check_constraint(1, $opts->{constraint}, @tables);
+    @tables = _check_constraint(0, $opts->{exclude}, @tables);
 
     TABLE: for my $table (@tables) {
         try {
@@ -267,7 +298,7 @@ sub _table_columns {
 }
 
 # Returns arrayref of pk col names
-sub _table_pk_info { 
+sub _table_pk_info {
     my ($self, $table) = @_;
 
     return [] if $self->_disable_pk_detection;
@@ -397,6 +428,14 @@ sub _table_fk_info {
 
     my %rels;
 
+    my @rules = (
+        'CASCADE',
+        'RESTRICT',
+        'SET NULL',
+        'NO ACTION',
+        'SET DEFAULT',
+    );
+
     my $i = 1; # for unnamed rels, which hopefully have only 1 column ...
     REL: while(my $raw_rel = $sth->fetchrow_arrayref) {
         my $uk_scm  = $raw_rel->[1];
@@ -404,8 +443,20 @@ sub _table_fk_info {
         my $uk_col  = $self->_lc($raw_rel->[3]);
         my $fk_scm  = $raw_rel->[5];
         my $fk_col  = $self->_lc($raw_rel->[7]);
+        my $key_seq = $raw_rel->[8] - 1;
         my $relid   = ($raw_rel->[11] || ( "__dcsld__" . $i++ ));
 
+        my $update_rule = $raw_rel->[9];
+        my $delete_rule = $raw_rel->[10];
+
+        $update_rule = $rules[$update_rule] if defined $update_rule;
+        $delete_rule = $rules[$delete_rule] if defined $delete_rule;
+
+        my $is_deferrable = $raw_rel->[13];
+
+        ($is_deferrable = $is_deferrable == 7 ? 0 : 1)
+            if defined $is_deferrable;
+
         foreach my $var ($uk_scm, $uk_tbl, $uk_col, $fk_scm, $fk_col, $relid) {
             $var =~ s/[\Q$self->{quote_char}\E]//g if defined $var;
         }
@@ -416,7 +467,7 @@ sub _table_fk_info {
             next REL;
         }
 
-        $rels{$relid}{tbl} = DBIx::Class::Schema::Loader::Table->new(
+        $rels{$relid}{tbl} ||= DBIx::Class::Schema::Loader::Table->new(
             loader => $self,
             name   => $uk_tbl,
             schema => $uk_scm,
@@ -424,16 +475,29 @@ sub _table_fk_info {
                 ignore_schema => 1
             )),
         );
-        $rels{$relid}{cols}{$uk_col} = $fk_col;
+
+        $rels{$relid}{attrs}{on_delete}     = $delete_rule if $delete_rule;
+        $rels{$relid}{attrs}{on_update}     = $update_rule if $update_rule;
+        $rels{$relid}{attrs}{is_deferrable} = $is_deferrable if defined $is_deferrable;
+
+        # Add this data IN ORDER
+        $rels{$relid}{rcols}[$key_seq] = $uk_col;
+        $rels{$relid}{lcols}[$key_seq] = $fk_col;
     }
     $sth->finish;
 
     my @rels;
     foreach my $relid (keys %rels) {
         push(@rels, {
-            remote_columns => [ keys   %{$rels{$relid}->{cols}} ],
-            local_columns  => [ values %{$rels{$relid}->{cols}} ],
+            remote_columns => [ grep defined, @{ $rels{$relid}{rcols} } ],
+            local_columns  => [ grep defined, @{ $rels{$relid}{lcols} } ],
             remote_table   => $rels{$relid}->{tbl},
+            (exists $rels{$relid}{attrs} ?
+                (attrs => $rels{$relid}{attrs})
+                :
+                ()
+            ),
+            _constraint_name => $relid,
         });
     }
 
@@ -559,7 +623,7 @@ sub _dbh_type_info_type_name {
     # We wrap it in a try block for MSSQL+DBD::Sybase, which can have issues.
     # TODO investigate further
     my $type_info = try { $self->dbh->type_info($type_num) };
-    
+
     return $type_info ? $type_info->{TYPE_NAME} : undef;
 }