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
use base 'SQL::Translator::Schema::Object';
-use vars qw($VERSION);
-
-$VERSION = sprintf "%d.%02d", q$Revision: 1.5 $ =~ /(\d+)\.(\d+)/;
-
# ----------------------------------------------------------------------
__PACKAGE__->_attributes( qw/
$self->{'parameters'} = \@unique;
}
- return wantarray ? @{ $self->{'parameters'} || [] } : $self->{'parameters'};
+ return wantarray ? @{ $self->{'parameters'} || [] } : ($self->{'parameters'} || '');
}
# ----------------------------------------------------------------------
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;
}