X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FSchema%2FProcedure.pm;h=d6d1dee4b32daba50b2215debcb768331c684023;hb=410d4a4252243e6679a9303fbcb7a94e5e1588d1;hp=e15082cbe9750aaa4aaba4087fdfc09d34eb93c7;hpb=4598b71c61d9fcb8a91ee6174a68a34d6f0eae24;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Schema/Procedure.pm b/lib/SQL/Translator/Schema/Procedure.pm index e15082c..d6d1dee 100644 --- a/lib/SQL/Translator/Schema/Procedure.pm +++ b/lib/SQL/Translator/Schema/Procedure.pm @@ -1,9 +1,7 @@ package SQL::Translator::Schema::Procedure; # ---------------------------------------------------------------------- -# $Id: Procedure.pm,v 1.6 2005-06-29 22:02:29 duality72 Exp $ -# ---------------------------------------------------------------------- -# 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 @@ -54,7 +52,7 @@ use base 'SQL::Translator::Schema::Object'; use vars qw($VERSION); -$VERSION = sprintf "%d.%02d", q$Revision: 1.6 $ =~ /(\d+)\.(\d+)/; +$VERSION = '1.59'; # ---------------------------------------------------------------------- @@ -255,13 +253,27 @@ 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 $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 $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; }