X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FSchema%2FIndex.pm;h=4a5237ea8c765a519f331ff12cfcd6406e0a9aae;hb=bdd8e79a7b6abb123363ff8006bc21b0bd33d698;hp=bae02de539a01d8407b65e5e716d6ce697e41dea;hpb=c243ec2b29cfeacb69d61b45bb44f8922c1d6bcf;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Schema/Index.pm b/lib/SQL/Translator/Schema/Index.pm index bae02de..4a5237e 100644 --- a/lib/SQL/Translator/Schema/Index.pm +++ b/lib/SQL/Translator/Schema/Index.pm @@ -1,7 +1,7 @@ package SQL::Translator::Schema::Index; # ---------------------------------------------------------------------- -# $Id: Index.pm,v 1.17 2007-03-06 23:50:23 duality72 Exp $ +# $Id: Index.pm,v 1.18 2007-10-24 10:55:44 schiffbruechige Exp $ # ---------------------------------------------------------------------- # Copyright (C) 2002-4 SQLFairy Authors # @@ -53,7 +53,7 @@ use base 'SQL::Translator::Schema::Object'; use vars qw($VERSION $TABLE_COUNT $VIEW_COUNT); -$VERSION = sprintf "%d.%02d", q$Revision: 1.17 $ =~ /(\d+)\.(\d+)/; +$VERSION = sprintf "%d.%02d", q$Revision: 1.18 $ =~ /(\d+)\.(\d+)/; my %VALID_INDEX_TYPE = ( UNIQUE, 1, @@ -64,7 +64,7 @@ my %VALID_INDEX_TYPE = ( # ---------------------------------------------------------------------- __PACKAGE__->_attributes( qw/ - name type fields table + name type fields table options /); =pod @@ -252,8 +252,12 @@ Determines if this index is the same as another my $ignore_index_names = shift; return 0 unless $self->SUPER::equals($other); + unless ($ignore_index_names) { + unless ((!$self->name && ($other->name eq $other->fields->[0])) || + (!$other->name && ($self->name eq $self->fields->[0]))) { return 0 unless $case_insensitive ? uc($self->name) eq uc($other->name) : $self->name eq $other->name; + } } #return 0 unless $self->is_valid eq $other->is_valid; return 0 unless $self->type eq $other->type;