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=1768e1d219f4cd552835adbbf6ee629d1a979018;hpb=da06ac74ada30aacf656943306679a28605ad5c8;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Schema/Procedure.pm b/lib/SQL/Translator/Schema/Procedure.pm index 1768e1d..34f8622 100644 --- a/lib/SQL/Translator/Schema/Procedure.pm +++ b/lib/SQL/Translator/Schema/Procedure.pm @@ -1,8 +1,6 @@ package SQL::Translator::Schema::Procedure; # ---------------------------------------------------------------------- -# $Id: Procedure.pm 1440 2009-01-17 16:31:57Z jawnsy $ -# ---------------------------------------------------------------------- # Copyright (C) 2002-2009 SQLFairy Authors # # This program is free software; you can redistribute it and/or @@ -54,9 +52,7 @@ use base 'SQL::Translator::Schema::Object'; use vars qw($VERSION); -$VERSION = '1.99'; - -# ---------------------------------------------------------------------- +$VERSION = '1.59'; __PACKAGE__->_attributes( qw/ name sql parameters comments owner sql schema order @@ -72,7 +68,6 @@ Object constructor. =cut -# ---------------------------------------------------------------------- sub parameters { =pod @@ -108,7 +103,6 @@ Gets and set the parameters of the stored procedure. return wantarray ? @{ $self->{'parameters'} || [] } : ($self->{'parameters'} || ''); } -# ---------------------------------------------------------------------- sub name { =pod @@ -127,7 +121,6 @@ Get or set the procedure's name. return $self->{'name'} || ''; } -# ---------------------------------------------------------------------- sub sql { =pod @@ -146,7 +139,6 @@ Get or set the procedure's SQL. return $self->{'sql'} || ''; } -# ---------------------------------------------------------------------- sub order { =pod @@ -165,7 +157,6 @@ Get or set the order of the procedure. return $self->{'order'}; } -# ---------------------------------------------------------------------- sub owner { =pod @@ -184,7 +175,6 @@ Get or set the owner of the procedure. return $self->{'owner'} || ''; } -# ---------------------------------------------------------------------- sub comments { =pod @@ -207,7 +197,7 @@ Get or set the comments on a procedure. } if ( @{ $self->{'comments'} || [] } ) { - return wantarray + return wantarray ? @{ $self->{'comments'} || [] } : join( "\n", @{ $self->{'comments'} || [] } ); } @@ -216,7 +206,6 @@ Get or set the comments on a procedure. } } -# ---------------------------------------------------------------------- sub schema { =pod @@ -240,7 +229,6 @@ Get or set the procedures's schema object. return $self->{'schema'}; } -# ---------------------------------------------------------------------- sub equals { =pod @@ -257,10 +245,10 @@ Determines if this procedure is the same as another 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; @@ -272,7 +260,7 @@ Determines if this procedure is the same as another $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; @@ -280,7 +268,6 @@ Determines if this procedure is the same as another return 1; } -# ---------------------------------------------------------------------- sub DESTROY { my $self = shift; undef $self->{'schema'}; # destroy cyclical reference @@ -288,13 +275,11 @@ sub DESTROY { 1; -# ---------------------------------------------------------------------- - =pod =head1 AUTHORS -Ken Y. Clark Ekclark@cshl.orgE, +Ken Youens-Clark Ekclark@cshl.orgE, Paul Harrington EPaul-Harrington@deshaw.comE. =cut