From: Chris Hilton <chilton@thoughtworks.com>
Date: Wed, 14 Mar 2007 20:22:58 +0000 (+0000)
Subject: Hacks for comparing sql attribute in equals() to ignore unimportant differences
X-Git-Tag: v0.11008~371
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=deee3ae8c4370f3643f75ce3007b5948d293e4dd;p=dbsrgits%2FSQL-Translator.git

Hacks for comparing sql attribute in equals() to ignore unimportant differences
---

diff --git a/lib/SQL/Translator/Schema/Procedure.pm b/lib/SQL/Translator/Schema/Procedure.pm
index e15082c..1f71227 100644
--- a/lib/SQL/Translator/Schema/Procedure.pm
+++ b/lib/SQL/Translator/Schema/Procedure.pm
@@ -1,7 +1,7 @@
 package SQL::Translator::Schema::Procedure;
 
 # ----------------------------------------------------------------------
-# $Id: Procedure.pm,v 1.6 2005-06-29 22:02:29 duality72 Exp $
+# $Id: Procedure.pm,v 1.7 2007-03-14 20:22:58 duality72 Exp $
 # ----------------------------------------------------------------------
 # Copyright (C) 2002-4 SQLFairy Authors
 #
@@ -54,7 +54,7 @@ use base 'SQL::Translator::Schema::Object';
 
 use vars qw($VERSION);
 
-$VERSION = sprintf "%d.%02d", q$Revision: 1.6 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.7 $ =~ /(\d+)\.(\d+)/;
 
 # ----------------------------------------------------------------------
 
@@ -255,13 +255,24 @@ Determines if this procedure is the same as another
 
     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 $self->sql eq $other->sql;
+    return 0 unless $case_insensitive ? uc($self->name) eq uc($other->name) : $self->name eq $other->name;
+    
+    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 $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;
 }
diff --git a/lib/SQL/Translator/Schema/View.pm b/lib/SQL/Translator/Schema/View.pm
index 2ad4bf9..401cbc5 100644
--- a/lib/SQL/Translator/Schema/View.pm
+++ b/lib/SQL/Translator/Schema/View.pm
@@ -1,7 +1,7 @@
 package SQL::Translator::Schema::View;
 
 # ----------------------------------------------------------------------
-# $Id: View.pm,v 1.12 2005-08-10 16:46:55 duality72 Exp $
+# $Id: View.pm,v 1.13 2007-03-14 20:22:58 duality72 Exp $
 # ----------------------------------------------------------------------
 # Copyright (C) 2002-4 SQLFairy Authors
 #
@@ -50,7 +50,7 @@ use base 'SQL::Translator::Schema::Object';
 
 use vars qw($VERSION $TABLE_COUNT $VIEW_COUNT);
 
-$VERSION = sprintf "%d.%02d", q$Revision: 1.12 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.13 $ =~ /(\d+)\.(\d+)/;
 
 # ----------------------------------------------------------------------
 
@@ -229,7 +229,17 @@ Determines if this view is the same as another
     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;
-    return 0 unless $self->sql eq $other->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;