package SQL::Translator::Schema::View;
# ----------------------------------------------------------------------
-# $Id: View.pm,v 1.11 2005-06-29 22:02:29 duality72 Exp $
+# $Id: View.pm,v 1.13 2007-03-14 20:22:58 duality72 Exp $
# ----------------------------------------------------------------------
# Copyright (C) 2002-4 SQLFairy Authors
#
use vars qw($VERSION $TABLE_COUNT $VIEW_COUNT);
-$VERSION = sprintf "%d.%02d", q$Revision: 1.11 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.13 $ =~ /(\d+)\.(\d+)/;
# ----------------------------------------------------------------------
my $self = shift;
my $other = shift;
+ my $case_insensitive = shift;
return 0 unless $self->SUPER::equals($other);
- return 0 unless $self->name eq $other->name;
+ 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->sql eq $other->sql;
- return 0 unless $self->_compare_objects(scalar $self->fields, scalar $other->fields);
+
+ 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;
+
+ my $selfFields = join(":", $self->fields);
+ my $otherFields = join(":", $other->fields);
+ return 0 unless $case_insensitive ? uc($selfFields) eq uc($otherFields) : $selfFields eq $otherFields;
return 0 unless $self->_compare_objects(scalar $self->extra, scalar $other->extra);
return 1;
}