Mooify SQLT::Schema

[dbsrgits/SQL-Translator.git] / lib / SQL / Translator / Schema / Procedure.pm

diff --git a/lib/SQL/Translator/Schema/Procedure.pm b/lib/SQL/Translator/Schema/Procedure.pm
index bfc0f2e..94f11ce 100644 (file)
--- a/lib/SQL/Translator/Schema/Procedure.pm
+++ b/lib/SQL/Translator/Schema/Procedure.pm
@@ -1,25 +1,5 @@
 package SQL::Translator::Schema::Procedure;
 
-# ----------------------------------------------------------------------
-# $Id: Procedure.pm,v 1.3 2004-11-04 16:29:56 grommit 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
@@ -48,16 +28,16 @@ stored procedures (and possibly other pieces of nameable SQL code?).
 =cut
 
 use strict;
+use warnings;
 use SQL::Translator::Utils 'parse_list_arg';
 
 use base 'SQL::Translator::Schema::Object';
 
-use vars qw($VERSION);
-
-$VERSION = sprintf "%d.%02d", q$Revision: 1.3 $ =~ /(\d+)\.(\d+)/;
+our $VERSION = '1.59';
 
-# ----------------------------------------------------------------------
-sub init {
+__PACKAGE__->_attributes( qw/
+    name sql parameters comments owner sql schema order
+/);
 
 =pod
 
@@ -69,17 +49,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
@@ -112,10 +81,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
@@ -134,7 +102,6 @@ Get or set the procedure's name.
     return $self->{'name'} || '';
 }
 
-# ----------------------------------------------------------------------
 sub sql {
 
 =pod
@@ -153,7 +120,6 @@ Get or set the procedure's SQL.
     return $self->{'sql'} || '';
 }
 
-# ----------------------------------------------------------------------
 sub order {
 
 =pod
@@ -172,7 +138,6 @@ Get or set the order of the procedure.
     return $self->{'order'};
 }
 
-# ----------------------------------------------------------------------
 sub owner {
 
 =pod
@@ -191,7 +156,6 @@ Get or set the owner of the procedure.
     return $self->{'owner'} || '';
 }
 
-# ----------------------------------------------------------------------
 sub comments {
 
 =pod
@@ -214,7 +178,7 @@ Get or set the comments on a procedure.
     }
 
     if ( @{ $self->{'comments'} || [] } ) {
-        return wantarray 
+        return wantarray
             ? @{ $self->{'comments'} || [] }
             : join( "\n", @{ $self->{'comments'} || [] } );
     }
@@ -223,7 +187,6 @@ Get or set the comments on a procedure.
     }
 }
 
-# ----------------------------------------------------------------------
 sub schema {
 
 =pod
@@ -247,7 +210,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
@@ -255,13 +256,11 @@ sub DESTROY {
 
 1;
 
-# ----------------------------------------------------------------------
-
 =pod
 
 =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