X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FSchema%2FProcedure.pm;h=6b63156706e1cabcf4921d8cf14e477bd80fb7c9;hb=d4f84dd192edc7a64a0b1a9923f1bafc0bc5ef9d;hp=a7fde3e900aa1c9f7e33d15ea5cbe7f4a52e9939;hpb=abf315bb9c2c78e40da9af6519e5daae76d60f08;p=dbsrgits%2FSQL-Translator.git

diff --git a/lib/SQL/Translator/Schema/Procedure.pm b/lib/SQL/Translator/Schema/Procedure.pm
index a7fde3e..6b63156 100644
--- a/lib/SQL/Translator/Schema/Procedure.pm
+++ b/lib/SQL/Translator/Schema/Procedure.pm
@@ -1,9 +1,9 @@
 package SQL::Translator::Schema::Procedure;
 
 # ----------------------------------------------------------------------
-# $Id: Procedure.pm,v 1.5 2005-06-27 21:59:20 duality72 Exp $
+# $Id: Procedure.pm 1440 2009-01-17 16:31:57Z jawnsy $
 # ----------------------------------------------------------------------
-# 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
@@ -52,10 +52,6 @@ use SQL::Translator::Utils 'parse_list_arg';
 
 use base 'SQL::Translator::Schema::Object';
 
-use vars qw($VERSION);
-
-$VERSION = sprintf "%d.%02d", q$Revision: 1.5 $ =~ /(\d+)\.(\d+)/;
-
 # ----------------------------------------------------------------------
 
 __PACKAGE__->_attributes( qw/
@@ -105,7 +101,7 @@ Gets and set the parameters of the stored procedure.
         $self->{'parameters'} = \@unique;
     }
 
-    return wantarray ? @{ $self->{'parameters'} || [] } : $self->{'parameters'};
+    return wantarray ? @{ $self->{'parameters'} || [] } : ($self->{'parameters'} || '');
 }
 
 # ----------------------------------------------------------------------
@@ -255,14 +251,28 @@ Determines if this procedure is the same as another
 
     my $self = shift;
     my $other = shift;
+    my $case_insensitive = shift;
+    my $ignore_sql = shift;
     
     return 0 unless $self->SUPER::equals($other);
-    return 0 unless $self->name eq $other->name;
-    return 0 unless $self->sql eq $other->sql;
-    return 0 unless $self->_compare_objects($self->parameters, $other->parameters);
+    return 0 unless $case_insensitive ? uc($self->name) eq uc($other->name) : $self->name eq $other->name;
+    
+    unless ($ignore_sql) {
+        my $selfSql = $self->sql;
+        my $otherSql = $other->sql;
+        # Remove comments
+        $selfSql =~ s/--.*$//mg;
+        $otherSql =~ s/--.*$//mg;
+        # Collapse whitespace to space to avoid whitespace comparison issues
+        $selfSql =~ s/\s+/ /sg;
+        $otherSql =~ s/\s+/ /sg;
+        return 0 unless $selfSql eq $otherSql;
+    }
+    
+    return 0 unless $self->_compare_objects(scalar $self->parameters, scalar $other->parameters);
 #    return 0 unless $self->comments eq $other->comments;
-    return 0 unless $self->owner eq $other->owner;
-    return 0 unless $self->_compare_objects($self->extra, $other->extra);
+#    return 0 unless $case_insensitive ? uc($self->owner) eq uc($other->owner) : $self->owner eq $other->owner;
+    return 0 unless $self->_compare_objects(scalar $self->extra, scalar $other->extra);
     return 1;
 }