X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FSchema%2FView.pm;h=ff0b1694d65be955f76a9c6e86c3eaaab9bc31b6;hb=f27f9229eaf8c5ce637bea1f99eb8f9bdb42799c;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..ff0b169 100644
--- a/lib/SQL/Translator/Schema/View.pm
+++ b/lib/SQL/Translator/Schema/View.pm
@@ -1,25 +1,5 @@
 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
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; version 2.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307  USA
-# -------------------------------------------------------------------
-
 =pod
 
 =head1 NAME
@@ -44,15 +24,14 @@ C<SQL::Translator::Schema::View> is the view object.
 =cut
 
 use strict;
+use warnings;
 use SQL::Translator::Utils 'parse_list_arg';
 
 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.59';
 
 __PACKAGE__->_attributes( qw/
     name sql fields schema order
@@ -68,7 +47,6 @@ Object constructor.
 
 =cut
 
-# ----------------------------------------------------------------------
 sub fields {
 
 =pod
@@ -106,7 +84,6 @@ names and keep them in order by the first occurrence of a field name.
     return wantarray ? @{ $self->{'fields'} || [] } : ($self->{'fields'} || '');
 }
 
-# ----------------------------------------------------------------------
 sub is_valid {
 
 =pod
@@ -127,7 +104,6 @@ Determine whether the view is valid or not.
     return 1;
 }
 
-# ----------------------------------------------------------------------
 sub name {
 
 =pod
@@ -145,7 +121,6 @@ Get or set the view's name.
     return $self->{'name'} || '';
 }
 
-# ----------------------------------------------------------------------
 sub order {
 
 =pod
@@ -167,7 +142,6 @@ Get or set the view's order.
     return $self->{'order'} || 0;
 }
 
-# ----------------------------------------------------------------------
 sub sql {
 
 =pod
@@ -185,7 +159,6 @@ Get or set the view's SQL.
     return $self->{'sql'} || '';
 }
 
-# ----------------------------------------------------------------------
 sub schema {
 
 =pod
@@ -209,7 +182,6 @@ Get or set the view's schema object.
     return $self->{'schema'};
 }
 
-# ----------------------------------------------------------------------
 sub equals {
 
 =pod
@@ -225,21 +197,24 @@ 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);
     return 0 unless $case_insensitive ? uc($selfFields) eq uc($otherFields) : $selfFields eq $otherFields;
@@ -247,7 +222,6 @@ Determines if this view is the same as another
     return 1;
 }
 
-# ----------------------------------------------------------------------
 sub DESTROY {
     my $self = shift;
     undef $self->{'schema'}; # destroy cyclical reference
@@ -255,12 +229,10 @@ sub DESTROY {
 
 1;
 
-# ----------------------------------------------------------------------
-
 =pod
 
 =head1 AUTHOR
 
-Ken Y. Clark E<lt>kclark@cpan.orgE<gt>.
+Ken Youens-Clark E<lt>kclark@cpan.orgE<gt>.
 
 =cut