X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FSchema%2FView.pm;h=0221f13b4e93a1e3c2f3bd146ae68b8d8ac1cfd9;hb=b03926cdac036bdbcf69e478ca29e1121c814646;hp=401cbc51b2e255571072f558fd869ed05f3b0352;hpb=deee3ae8c4370f3643f75ce3007b5948d293e4dd;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Schema/View.pm b/lib/SQL/Translator/Schema/View.pm index 401cbc5..0221f13 100644 --- a/lib/SQL/Translator/Schema/View.pm +++ b/lib/SQL/Translator/Schema/View.pm @@ -1,9 +1,7 @@ package SQL::Translator::Schema::View; # ---------------------------------------------------------------------- -# $Id: View.pm,v 1.13 2007-03-14 20:22:58 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 @@ -50,7 +48,7 @@ use base 'SQL::Translator::Schema::Object'; use vars qw($VERSION $TABLE_COUNT $VIEW_COUNT); -$VERSION = sprintf "%d.%02d", q$Revision: 1.13 $ =~ /(\d+)\.(\d+)/; +$VERSION = '1.99'; # ---------------------------------------------------------------------- @@ -225,20 +223,23 @@ Determines if this view 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 $case_insensitive ? uc($self->name) eq uc($other->name) : $self->name eq $other->name; #return 0 unless $self->is_valid eq $other->is_valid; - 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; + 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);