X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FSchema%2FIndex.pm;h=e952cdac14b62101df01e009d20a497e5b12aa2f;hb=478f608d9028508396da37bb5df10b3057b96981;hp=78d9b2b0b11be310815e9e859ba1bf7d327a1f0f;hpb=4598b71c61d9fcb8a91ee6174a68a34d6f0eae24;p=dbsrgits%2FSQL-Translator.git

diff --git a/lib/SQL/Translator/Schema/Index.pm b/lib/SQL/Translator/Schema/Index.pm
index 78d9b2b..e952cda 100644
--- a/lib/SQL/Translator/Schema/Index.pm
+++ b/lib/SQL/Translator/Schema/Index.pm
@@ -1,9 +1,9 @@
 package SQL::Translator::Schema::Index;
 
 # ----------------------------------------------------------------------
-# $Id: Index.pm,v 1.13 2005-06-29 22:02:29 duality72 Exp $
+# $Id$
 # ----------------------------------------------------------------------
-# Copyright (C) 2002-4 SQLFairy Authors
+# Copyright (C) 2002-2009 SQLFairy Authors
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -51,20 +51,19 @@ use SQL::Translator::Utils 'parse_list_arg';
 
 use base 'SQL::Translator::Schema::Object';
 
-use vars qw($VERSION $TABLE_COUNT $VIEW_COUNT);
-
-$VERSION = sprintf "%d.%02d", q$Revision: 1.13 $ =~ /(\d+)\.(\d+)/;
+use vars qw($TABLE_COUNT $VIEW_COUNT);
 
 my %VALID_INDEX_TYPE = (
-    UNIQUE,    1,
-    NORMAL,    1,
-    FULL_TEXT, 1, # MySQL only (?)
+  UNIQUE         => 1,
+  NORMAL         => 1,
+  FULL_TEXT      => 1, # MySQL only (?)
+  SPATIAL        => 1, # MySQL only (?)
 );
 
 # ----------------------------------------------------------------------
 
 __PACKAGE__->_attributes( qw/
-    name type fields table
+    name type fields table options
 /);
 
 =pod
@@ -220,17 +219,24 @@ Get or set the index's type.
 
   my $type = $index->type('unique');
 
+Get or set the index's options (e.g., "using" or "where" for PG).  Returns
+
+Currently there are only four acceptable types: UNIQUE, NORMAL, FULL_TEXT,
+and SPATIAL. The latter two might be MySQL-specific. While both lowercase
+and uppercase types are acceptable input, this method returns the type in
+uppercase.
+
 =cut
 
     my $self = shift;
 
-    if ( my $type = shift ) {
+    if ( my $type = uc shift ) {
         return $self->error("Invalid index type: $type") 
             unless $VALID_INDEX_TYPE{ $type };
         $self->{'type'} = $type;
     }
 
-    return $self->{'type'} || NORMAL;
+    return $self->{'type'} || 'NORMAL';
 }
 
 # ----------------------------------------------------------------------
@@ -249,12 +255,33 @@ Determines if this index is the same as another
     my $self = shift;
     my $other = shift;
     my $case_insensitive = shift;
+    my $ignore_index_names = shift;
     
     return 0 unless $self->SUPER::equals($other);
-#    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;
+
+    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;
-    return 0 unless $self->_compare_objects(scalar $self->fields, scalar $other->fields);
+    
+    # Check fields, regardless of order
+    my %otherFields = ();	# create a hash of the other fields
+    foreach my $otherField ($other->fields) {
+    	$otherField = uc($otherField) if $case_insensitive;
+    	$otherFields{$otherField} = 1;
+    }
+    foreach my $selfField ($self->fields) { # check for self fields in hash
+    	$selfField = uc($selfField) if $case_insensitive;
+    	return 0 unless $otherFields{$selfField};
+    	delete $otherFields{$selfField};
+    }
+    # Check all other fields were accounted for
+    return 0 unless keys %otherFields == 0;
+
     return 0 unless $self->_compare_objects(scalar $self->options, scalar $other->options);
     return 0 unless $self->_compare_objects(scalar $self->extra, scalar $other->extra);
     return 1;