X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FSchema%2FTable.pm;h=72c887ed6e3c764a29abf0e66c8f8d5ba46ebe09;hb=63c988edd90d9a126b5452d41f3a19cc47bb9748;hp=2e9f2531633cd459eb06c7e81d9568f099eed847;hpb=f9c5e794de9710a4aa68716d49da47316834d8c8;p=dbsrgits%2FSQL-Translator.git

diff --git a/lib/SQL/Translator/Schema/Table.pm b/lib/SQL/Translator/Schema/Table.pm
index 2e9f253..72c887e 100644
--- a/lib/SQL/Translator/Schema/Table.pm
+++ b/lib/SQL/Translator/Schema/Table.pm
@@ -1,7 +1,7 @@
 package SQL::Translator::Schema::Table;
 
 # ----------------------------------------------------------------------
-# $Id: Table.pm,v 1.21 2003-09-25 17:28:37 allenday Exp $
+# $Id: Table.pm,v 1.23 2003-10-04 01:22:04 kycl4rk Exp $
 # ----------------------------------------------------------------------
 # Copyright (C) 2003 Ken Y. Clark <kclark@cpan.org>
 #
@@ -51,7 +51,7 @@ use Data::Dumper;
 use base 'Class::Base';
 use vars qw( $VERSION $FIELD_ORDER );
 
-$VERSION = sprintf "%d.%02d", q$Revision: 1.21 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.23 $ =~ /(\d+)\.(\d+)/;
 
 # ----------------------------------------------------------------------
 sub init {
@@ -135,25 +135,25 @@ C<SQL::Translator::Schema::Constraint> object.
     }
     #
     # See if another constraint of the same type 
-    # covers the same fields.
+    # covers the same fields.  -- This doesn't work!  ky
     #
-    elsif ( $constraint->type ne CHECK_C ) {
-        my @field_names = $constraint->fields;
-        for my $c ( 
-            grep { $_->type eq $constraint->type } 
-            $self->get_constraints 
-        ) {
-            my %fields = map { $_, 1 } $c->fields;
-            for my $field_name ( @field_names ) {
-                if ( $fields{ $field_name } ) {
-                    $constraint = $c;
-                    $ok = 0; 
-                    last;
-                }
-            }
-            last unless $ok;
-        }
-    }
+#    elsif ( $constraint->type ne CHECK_C ) {
+#        my @field_names = $constraint->fields;
+#        for my $c ( 
+#            grep { $_->type eq $constraint->type } 
+#            $self->get_constraints 
+#        ) {
+#            my %fields = map { $_, 1 } $c->fields;
+#            for my $field_name ( @field_names ) {
+#                if ( $fields{ $field_name } ) {
+#                    $constraint = $c;
+#                    $ok = 0; 
+#                    last;
+#                }
+#            }
+#            last unless $ok;
+#        }
+#    }
 
     if ( $ok ) {
         push @{ $self->{'constraints'} }, $constraint;
@@ -446,6 +446,7 @@ sub is_trivial_link {
 	  $self->{'is_trivial_link'} = 0;
 	  last;
 	}
+    }
 
     return $self->{'is_trivial_link'};