X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FSchema%2FProcedure.pm;h=34f862228465e1272c24a04b9ee6d8b08fc16aa8;hb=282bf498899061be19ec7fd7ce16bf25a562fdcf;hp=c3b5a278acfaac1829b638077e2a39cc258d542c;hpb=2c0b3f9f5158b8b9f29f72aa3a7ef0c7af7a0888;p=dbsrgits%2FSQL-Translator.git

diff --git a/lib/SQL/Translator/Schema/Procedure.pm b/lib/SQL/Translator/Schema/Procedure.pm
index c3b5a27..34f8622 100644
--- a/lib/SQL/Translator/Schema/Procedure.pm
+++ b/lib/SQL/Translator/Schema/Procedure.pm
@@ -1,10 +1,7 @@
 package SQL::Translator::Schema::Procedure;
 
 # ----------------------------------------------------------------------
-# $Id: Procedure.pm,v 1.1 2003-10-08 17:31:24 kycl4rk Exp $
-# ----------------------------------------------------------------------
-# Copyright (C) 2003 Ken Y. Clark <kclark@cpan.org>,
-#   Paul Harrington <Paul-Harrington@deshaw.com>.
+# 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
@@ -49,16 +46,17 @@ stored procedures (and possibly other pieces of nameable SQL code?).
 =cut
 
 use strict;
-use Class::Base;
 use SQL::Translator::Utils 'parse_list_arg';
 
-use base 'Class::Base';
+use base 'SQL::Translator::Schema::Object';
+
 use vars qw($VERSION);
 
-$VERSION = sprintf "%d.%02d", q$Revision: 1.1 $ =~ /(\d+)\.(\d+)/;
+$VERSION = '1.59';
 
-# ----------------------------------------------------------------------
-sub init {
+__PACKAGE__->_attributes( qw/
+    name sql parameters comments owner sql schema order
+/);
 
 =pod
 
@@ -70,17 +68,6 @@ Object constructor.
 
 =cut
 
-    my ( $self, $config ) = @_;
-
-    for my $arg ( qw[ name sql parameters comments owner sql schema ] ) {
-        next unless $config->{ $arg };
-        $self->$arg( $config->{ $arg } ) or return;
-    }
-
-    return $self;
-}
-
-# ----------------------------------------------------------------------
 sub parameters {
 
 =pod
@@ -113,10 +100,9 @@ Gets and set the parameters of the stored procedure.
         $self->{'parameters'} = \@unique;
     }
 
-    return wantarray ? @{ $self->{'parameters'} || [] } : $self->{'parameters'};
+    return wantarray ? @{ $self->{'parameters'} || [] } : ($self->{'parameters'} || '');
 }
 
-# ----------------------------------------------------------------------
 sub name {
 
 =pod
@@ -135,7 +121,6 @@ Get or set the procedure's name.
     return $self->{'name'} || '';
 }
 
-# ----------------------------------------------------------------------
 sub sql {
 
 =pod
@@ -154,7 +139,6 @@ Get or set the procedure's SQL.
     return $self->{'sql'} || '';
 }
 
-# ----------------------------------------------------------------------
 sub order {
 
 =pod
@@ -173,7 +157,6 @@ Get or set the order of the procedure.
     return $self->{'order'};
 }
 
-# ----------------------------------------------------------------------
 sub owner {
 
 =pod
@@ -192,7 +175,6 @@ Get or set the owner of the procedure.
     return $self->{'owner'} || '';
 }
 
-# ----------------------------------------------------------------------
 sub comments {
 
 =pod
@@ -215,7 +197,7 @@ Get or set the comments on a procedure.
     }
 
     if ( @{ $self->{'comments'} || [] } ) {
-        return wantarray 
+        return wantarray
             ? @{ $self->{'comments'} || [] }
             : join( "\n", @{ $self->{'comments'} || [] } );
     }
@@ -224,7 +206,6 @@ Get or set the comments on a procedure.
     }
 }
 
-# ----------------------------------------------------------------------
 sub schema {
 
 =pod
@@ -248,7 +229,45 @@ Get or set the procedures's schema object.
     return $self->{'schema'};
 }
 
-# ----------------------------------------------------------------------
+sub equals {
+
+=pod
+
+=head2 equals
+
+Determines if this procedure is the same as another
+
+  my $isIdentical = $procedure1->equals( $procedure2 );
+
+=cut
+
+    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;
+
+    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;
+    }
+
+    return 0 unless $self->_compare_objects(scalar $self->parameters, scalar $other->parameters);
+#    return 0 unless $self->comments eq $other->comments;
+#    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;
+}
+
 sub DESTROY {
     my $self = shift;
     undef $self->{'schema'}; # destroy cyclical reference
@@ -260,5 +279,7 @@ sub DESTROY {
 
 =head1 AUTHORS
 
-Ken Y. Clark E<lt>kclark@cshl.orgE<gt>,
+Ken Youens-Clark E<lt>kclark@cshl.orgE<gt>,
 Paul Harrington E<lt>Paul-Harrington@deshaw.comE<gt>.
+
+=cut