X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FSchema%2FView.pm;h=9ff84cc3033e70f6c62fefc9f8fdef0410ddef70;hb=6f2cf9ca18d6589218199ce6cfbdb368df8254ad;hp=f940c8925f9802bd7db997b381c7d94ad165e7a2;hpb=935800450f88b0500c4fa7c3b174cd22b5f9eb56;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Schema/View.pm b/lib/SQL/Translator/Schema/View.pm index f940c89..9ff84cc 100644 --- a/lib/SQL/Translator/Schema/View.pm +++ b/lib/SQL/Translator/Schema/View.pm @@ -24,15 +24,14 @@ C 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); +our ( $TABLE_COUNT, $VIEW_COUNT ); -$VERSION = '1.59'; - -# ---------------------------------------------------------------------- +our $VERSION = '1.59'; __PACKAGE__->_attributes( qw/ name sql fields schema order @@ -48,7 +47,6 @@ Object constructor. =cut -# ---------------------------------------------------------------------- sub fields { =pod @@ -86,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 @@ -107,7 +104,6 @@ Determine whether the view is valid or not. return 1; } -# ---------------------------------------------------------------------- sub name { =pod @@ -125,7 +121,6 @@ Get or set the view's name. return $self->{'name'} || ''; } -# ---------------------------------------------------------------------- sub order { =pod @@ -147,7 +142,6 @@ Get or set the view's order. return $self->{'order'} || 0; } -# ---------------------------------------------------------------------- sub sql { =pod @@ -165,7 +159,6 @@ Get or set the view's SQL. return $self->{'sql'} || ''; } -# ---------------------------------------------------------------------- sub schema { =pod @@ -189,7 +182,6 @@ Get or set the view's schema object. return $self->{'schema'}; } -# ---------------------------------------------------------------------- sub equals { =pod @@ -206,11 +198,11 @@ Determines if this view 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; #return 0 unless $self->is_valid eq $other->is_valid; - + unless ($ignore_sql) { my $selfSql = $self->sql; my $otherSql = $other->sql; @@ -222,7 +214,7 @@ Determines if this view is the same as another $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; @@ -230,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 @@ -238,8 +229,6 @@ sub DESTROY { 1; -# ---------------------------------------------------------------------- - =pod =head1 AUTHOR