package SQL::Translator::Schema::View;
# ----------------------------------------------------------------------
-# $Id: View.pm,v 1.10 2005-06-27 21:59:20 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
use vars qw($VERSION $TABLE_COUNT $VIEW_COUNT);
-$VERSION = sprintf "%d.%02d", q$Revision: 1.10 $ =~ /(\d+)\.(\d+)/;
+$VERSION = '1.59';
# ----------------------------------------------------------------------
$self->{'fields'} = \@unique;
}
- return wantarray ? @{ $self->{'fields'} || [] } : $self->{'fields'};
+ return wantarray ? @{ $self->{'fields'} || [] } : ($self->{'fields'} || '');
}
# ----------------------------------------------------------------------
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->is_valid eq $other->is_valid;
- return 0 unless $self->sql eq $other->sql;
- return 0 unless $self->_compare_objects($self->fields, $other->fields);
- return 0 unless $self->_compare_objects($self->extra, $other->extra);
+ 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_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;
+ }
+
+ 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;
}