X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FSchema%2FTable.pm;h=a7ee46425017616d4f47730dcbcac74094e092c5;hb=52068c9582384e80a9806471ce9af4c815262175;hp=3e02c4352aff6b917f321fb550aa9484318cf8f1;hpb=11ad2df91bcc0674faa8fb5b6bab52c9e4a73762;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Schema/Table.pm b/lib/SQL/Translator/Schema/Table.pm index 3e02c43..a7ee464 100644 --- a/lib/SQL/Translator/Schema/Table.pm +++ b/lib/SQL/Translator/Schema/Table.pm @@ -1,23 +1,5 @@ package SQL::Translator::Schema::Table; -# ---------------------------------------------------------------------- -# 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 -# 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 @@ -29,7 +11,7 @@ SQL::Translator::Schema::Table - SQL::Translator table object use SQL::Translator::Schema::Table; my $table = SQL::Translator::Schema::Table->new( name => 'foo' ); -=head1 DESCSIPTION +=head1 DESCRIPTION C is the table object. @@ -37,19 +19,24 @@ C is the table object. =cut -use strict; -use SQL::Translator::Utils 'parse_list_arg'; +use Moo; +use SQL::Translator::Utils qw(parse_list_arg ex2err throw); +use SQL::Translator::Types qw(schema_obj); use SQL::Translator::Schema::Constants; use SQL::Translator::Schema::Constraint; use SQL::Translator::Schema::Field; use SQL::Translator::Schema::Index; -use Data::Dumper; -use base 'SQL::Translator::Schema::Object'; +use Carp::Clan '^SQL::Translator'; +use List::Util 'max'; -use vars qw( $VERSION ); +with qw( + SQL::Translator::Schema::Role::Extra + SQL::Translator::Schema::Role::Error + SQL::Translator::Schema::Role::Compare +); -$VERSION = '1.59'; +our $VERSION = '1.59'; # Stringify to our name, being careful not to pass any args through so we don't # accidentally set it to undef. We also have to tweak bool so the object is @@ -60,45 +47,20 @@ use overload fallback => 1, ; -# ---------------------------------------------------------------------- - -__PACKAGE__->_attributes( qw/schema name comments options order/ ); - =pod =head2 new Object constructor. - my $table = SQL::Translator::Schema::Table->new( + my $table = SQL::Translator::Schema::Table->new( schema => $schema, name => 'foo', ); -=cut - -sub new { - my $class = shift; - my $self = $class->SUPER::new (@_) - or return; - - $self->{_order} = { map { $_ => 0 } qw/ - field - /}; - - return $self; -} - - - -# ---------------------------------------------------------------------- -sub add_constraint { - -=pod - =head2 add_constraint -Add a constraint to the table. Returns the newly created +Add a constraint to the table. Returns the newly created C object. my $c1 = $table->add_constraint( @@ -112,6 +74,15 @@ C object. =cut +has _constraints => ( + is => 'ro', + init_arg => undef, + default => sub { +[] }, + predicate => 1, + lazy => 1, +); + +sub add_constraint { my $self = shift; my $constraint_class = 'SQL::Translator::Schema::Constraint'; my $constraint; @@ -123,7 +94,7 @@ C object. else { my %args = @_; $args{'table'} = $self; - $constraint = $constraint_class->new( \%args ) or + $constraint = $constraint_class->new( \%args ) or return $self->error( $constraint_class->error ); } @@ -136,7 +107,7 @@ C object. if ( $pk && $constraint->type eq PRIMARY_KEY ) { $self->primary_key( $constraint->fields ); $pk->name($constraint->name) if $constraint->name; - my %extra = $constraint->extra; + my %extra = $constraint->extra; $pk->extra(%extra) if keys %extra; $constraint = $pk; $ok = 0; @@ -149,20 +120,20 @@ C object. } } # - # See if another constraint of the same type + # See if another constraint of the same type # covers the same fields. -- This doesn't work! ky # # elsif ( $constraint->type ne CHECK_C ) { # my @field_names = $constraint->fields; -# for my $c ( -# grep { $_->type eq $constraint->type } -# $self->get_constraints +# for my $c ( +# grep { $_->type eq $constraint->type } +# $self->get_constraints # ) { # my %fields = map { $_, 1 } $c->fields; # for my $field_name ( @field_names ) { # if ( $fields{ $field_name } ) { # $constraint = $c; -# $ok = 0; +# $ok = 0; # last; # } # } @@ -171,17 +142,12 @@ C object. # } if ( $ok ) { - push @{ $self->{'constraints'} }, $constraint; + push @{ $self->_constraints }, $constraint; } return $constraint; } -# ---------------------------------------------------------------------- -sub drop_constraint { - -=pod - =head2 drop_constraint Remove a constraint from the table. Returns the constraint object if the index @@ -192,6 +158,7 @@ an index name or an C object. =cut +sub drop_constraint { my $self = shift; my $constraint_class = 'SQL::Translator::Schema::Constraint'; my $constraint_name; @@ -203,22 +170,17 @@ an index name or an C object. $constraint_name = shift; } - if ( ! grep { $_->name eq $constraint_name } @ { $self->{'constraints'} } ) { + if ( ! ($self->_has_constraints && grep { $_->name eq $constraint_name } @ { $self->_constraints }) ) { return $self->error(qq[Can't drop constraint: "$constraint_name" doesn't exist]); } - my @cs = @{ $self->{'constraints'} }; + my @cs = @{ $self->_constraints }; my ($constraint_id) = grep { $cs[$_]->name eq $constraint_name } (0..$#cs); - my $constraint = splice(@{$self->{'constraints'}}, $constraint_id, 1); + my $constraint = splice(@{$self->_constraints}, $constraint_id, 1); return $constraint; } -# ---------------------------------------------------------------------- -sub add_index { - -=pod - =head2 add_index Add an index to the table. Returns the newly created @@ -235,6 +197,15 @@ C object. =cut +has _indices => ( + is => 'ro', + init_arg => undef, + default => sub { [] }, + predicate => 1, + lazy => 1, +); + +sub add_index { my $self = shift; my $index_class = 'SQL::Translator::Schema::Index'; my $index; @@ -246,21 +217,16 @@ C object. else { my %args = @_; $args{'table'} = $self; - $index = $index_class->new( \%args ) or return + $index = $index_class->new( \%args ) or return $self->error( $index_class->error ); } foreach my $ex_index ($self->get_indices) { return if ($ex_index->equals($index)); } - push @{ $self->{'indices'} }, $index; + push @{ $self->_indices }, $index; return $index; } -# ---------------------------------------------------------------------- -sub drop_index { - -=pod - =head2 drop_index Remove an index from the table. Returns the index object if the index was @@ -271,6 +237,7 @@ an index name of an C object. =cut +sub drop_index { my $self = shift; my $index_class = 'SQL::Translator::Schema::Index'; my $index_name; @@ -282,27 +249,22 @@ an index name of an C object. $index_name = shift; } - if ( ! grep { $_->name eq $index_name } @{ $self->{'indices'} }) { + if ( ! ($self->_has_indices && grep { $_->name eq $index_name } @{ $self->_indices }) ) { return $self->error(qq[Can't drop index: "$index_name" doesn't exist]); } - my @is = @{ $self->{'indices'} }; + my @is = @{ $self->_indices }; my ($index_id) = grep { $is[$_]->name eq $index_name } (0..$#is); - my $index = splice(@{$self->{'indices'}}, $index_id, 1); + my $index = splice(@{$self->_indices}, $index_id, 1); return $index; } -# ---------------------------------------------------------------------- -sub add_field { - -=pod - =head2 add_field Add an field to the table. Returns the newly created -C object. The "name" parameter is -required. If you try to create a field with the same name as an +C object. The "name" parameter is +required. If you try to create a field with the same name as an existing field, you will get an error and the field will not be created. my $f1 = $table->add_field( @@ -311,14 +273,23 @@ existing field, you will get an error and the field will not be created. size => 11, ); - my $f2 = SQL::Translator::Schema::Field->new( - name => 'name', + my $f2 = SQL::Translator::Schema::Field->new( + name => 'name', table => $table, ); $f2 = $table->add_field( $field2 ) or die $table->error; =cut +has _fields => ( + is => 'ro', + init_arg => undef, + default => sub { +{} }, + predicate => 1, + lazy => 1 +); + +sub add_field { my $self = shift; my $field_class = 'SQL::Translator::Schema::Field'; my $field; @@ -330,38 +301,59 @@ existing field, you will get an error and the field will not be created. else { my %args = @_; $args{'table'} = $self; - $field = $field_class->new( \%args ) or return + $field = $field_class->new( \%args ) or return $self->error( $field_class->error ); } - $field->order( ++$self->{_order}{field} ); + my $existing_order = { map { $_->order => $_->name } $self->get_fields }; + + # supplied order, possible unordered assembly + if ( $field->order ) { + if($existing_order->{$field->order}) { + croak sprintf + "Requested order '%d' for column '%s' conflicts with already existing column '%s'", + $field->order, + $field->name, + $existing_order->{$field->order}, + ; + } + } + else { + my $last_field_no = max(keys %$existing_order) || 0; + if ( $last_field_no != scalar keys %$existing_order ) { + croak sprintf + "Table '%s' field order incomplete - unable to auto-determine order for newly added field", + $self->name, + ; + } + + $field->order( $last_field_no + 1 ); + } + # We know we have a name as the Field->new above errors if none given. my $field_name = $field->name; - if ( exists $self->{'fields'}{ $field_name } ) { + if ( $self->get_field($field_name) ) { return $self->error(qq[Can't create field: "$field_name" exists]); } else { - $self->{'fields'}{ $field_name } = $field; + $self->_fields->{ $field_name } = $field; } return $field; } -# ---------------------------------------------------------------------- -sub drop_field { - -=pod =head2 drop_field -Remove a field from the table. Returns the field object if the field was -found and removed, an error otherwise. The single parameter can be either +Remove a field from the table. Returns the field object if the field was +found and removed, an error otherwise. The single parameter can be either a field name or an C object. $table->drop_field('myfield'); =cut +sub drop_field { my $self = shift; my $field_class = 'SQL::Translator::Schema::Field'; my $field_name; @@ -375,11 +367,11 @@ a field name or an C object. my %args = @_; my $cascade = $args{'cascade'}; - if ( ! exists $self->{'fields'}{ $field_name } ) { + if ( ! ($self->_has_fields && exists $self->_fields->{ $field_name } ) ) { return $self->error(qq[Can't drop field: "$field_name" doesn't exists]); } - my $field = delete $self->{'fields'}{ $field_name }; + my $field = delete $self->_fields->{ $field_name }; if ( $cascade ) { # Remove this field from all indices using it @@ -400,14 +392,9 @@ a field name or an C object. return $field; } -# ---------------------------------------------------------------------- -sub comments { - -=pod - =head2 comments -Get or set the comments on a table. May be called several times to +Get or set the comments on a table. May be called several times to set and it will accumulate the comments. Called in an array context, returns each comment individually; called in a scalar context, returns all the comments joined on newlines. @@ -418,29 +405,27 @@ all the comments joined on newlines. =cut +has comments => ( + is => 'rw', + coerce => sub { ref($_[0]) eq 'ARRAY' ? $_[0] : [$_[0]] }, + default => sub { [] }, +); + +around comments => sub { + my $orig = shift; my $self = shift; my @comments = ref $_[0] ? @{ $_[0] } : @_; for my $arg ( @comments ) { $arg = $arg->[0] if ref $arg; - push @{ $self->{'comments'} }, $arg if defined $arg && $arg; + push @{ $self->$orig }, $arg if defined $arg && $arg; } - if ( @{ $self->{'comments'} || [] } ) { - return wantarray - ? @{ $self->{'comments'} } - : join( "\n", @{ $self->{'comments'} } ) - ; - } - else { - return wantarray ? () : undef; - } -} - -# ---------------------------------------------------------------------- -sub get_constraints { - -=pod + @comments = @{$self->$orig}; + return wantarray ? @comments + : @comments ? join( "\n", @comments ) + : undef; +}; =head2 get_constraints @@ -450,11 +435,12 @@ Returns all the constraint objects as an array or array reference. =cut +sub get_constraints { my $self = shift; - if ( ref $self->{'constraints'} ) { - return wantarray - ? @{ $self->{'constraints'} } : $self->{'constraints'}; + if ( $self->_has_constraints ) { + return wantarray + ? @{ $self->_constraints } : $self->_constraints; } else { $self->error('No constraints'); @@ -462,11 +448,6 @@ Returns all the constraint objects as an array or array reference. } } -# ---------------------------------------------------------------------- -sub get_indices { - -=pod - =head2 get_indices Returns all the index objects as an array or array reference. @@ -475,12 +456,13 @@ Returns all the index objects as an array or array reference. =cut +sub get_indices { my $self = shift; - if ( ref $self->{'indices'} ) { - return wantarray - ? @{ $self->{'indices'} } - : $self->{'indices'}; + if ( $self->_has_indices ) { + return wantarray + ? @{ $self->_indices } + : $self->_indices; } else { $self->error('No indices'); @@ -488,11 +470,6 @@ Returns all the index objects as an array or array reference. } } -# ---------------------------------------------------------------------- -sub get_field { - -=pod - =head2 get_field Returns a field by the name provided. @@ -501,26 +478,24 @@ Returns a field by the name provided. =cut +sub get_field { my $self = shift; my $field_name = shift or return $self->error('No field name'); my $case_insensitive = shift; + return $self->error(qq[Field "$field_name" does not exist]) + unless $self->_has_fields; if ( $case_insensitive ) { - $field_name = uc($field_name); - foreach my $field ( keys %{$self->{fields}} ) { - return $self->{fields}{$field} if $field_name eq uc($field); - } - return $self->error(qq[Field "$field_name" does not exist]); + $field_name = uc($field_name); + foreach my $field ( keys %{$self->_fields} ) { + return $self->_fields->{$field} if $field_name eq uc($field); + } + return $self->error(qq[Field "$field_name" does not exist]); } return $self->error( qq[Field "$field_name" does not exist] ) unless - exists $self->{'fields'}{ $field_name }; - return $self->{'fields'}{ $field_name }; + exists $self->_fields->{ $field_name }; + return $self->_fields->{ $field_name }; } -# ---------------------------------------------------------------------- -sub get_fields { - -=pod - =head2 get_fields Returns all the field objects as an array or array reference. @@ -529,12 +504,13 @@ Returns all the field objects as an array or array reference. =cut +sub get_fields { my $self = shift; - my @fields = + my @fields = map { $_->[1] } sort { $a->[0] <=> $b->[0] } map { [ $_->order, $_ ] } - values %{ $self->{'fields'} || {} }; + values %{ $self->_has_fields ? $self->_fields : {} }; if ( @fields ) { return wantarray ? @fields : \@fields; @@ -545,11 +521,6 @@ Returns all the field objects as an array or array reference. } } -# ---------------------------------------------------------------------- -sub is_valid { - -=pod - =head2 is_valid Determine whether the view is valid or not. @@ -558,12 +529,13 @@ Determine whether the view is valid or not. =cut +sub is_valid { my $self = shift; return $self->error('No name') unless $self->name; return $self->error('No fields') unless $self->get_fields; - for my $object ( - $self->get_fields, $self->get_indices, $self->get_constraints + for my $object ( + $self->get_fields, $self->get_indices, $self->get_constraints ) { return $object->error unless $object->is_valid; } @@ -571,71 +543,54 @@ Determine whether the view is valid or not. return 1; } -# ---------------------------------------------------------------------- -sub is_trivial_link { - -=pod - =head2 is_trivial_link True if table has no data (non-key) fields and only uses single key joins. =cut +has is_trivial_link => ( is => 'lazy', init_arg => undef ); + +sub _build_is_trivial_link { my $self = shift; return 0 if $self->is_data; - return $self->{'is_trivial_link'} if defined $self->{'is_trivial_link'}; - - $self->{'is_trivial_link'} = 1; my %fk = (); foreach my $field ( $self->get_fields ) { - next unless $field->is_foreign_key; - $fk{$field->foreign_key_reference->reference_table}++; - } + next unless $field->is_foreign_key; + $fk{$field->foreign_key_reference->reference_table}++; + } foreach my $referenced (keys %fk){ - if($fk{$referenced} > 1){ - $self->{'is_trivial_link'} = 0; - last; - } + if($fk{$referenced} > 1){ + return 0; + } } - return $self->{'is_trivial_link'}; - + return 1; } -sub is_data { - -=pod - =head2 is_data Returns true if the table has some non-key fields. =cut - my $self = shift; - return $self->{'is_data'} if defined $self->{'is_data'}; +has is_data => ( is => 'lazy', init_arg => undef ); - $self->{'is_data'} = 0; +sub _build_is_data { + my $self = shift; foreach my $field ( $self->get_fields ) { if ( !$field->is_primary_key and !$field->is_foreign_key ) { - $self->{'is_data'} = 1; - return $self->{'is_data'}; + return 1; } } - return $self->{'is_data'}; + return 0; } -# ---------------------------------------------------------------------- -sub can_link { - -=pod - =head2 can_link Determine whether the table can link two arg tables via many-to-many. @@ -644,15 +599,18 @@ Determine whether the table can link two arg tables via many-to-many. =cut +has _can_link => ( is => 'ro', init_arg => undef, default => sub { +{} } ); + +sub can_link { my ( $self, $table1, $table2 ) = @_; - return $self->{'can_link'}{ $table1->name }{ $table2->name } - if defined $self->{'can_link'}{ $table1->name }{ $table2->name }; + return $self->_can_link->{ $table1->name }{ $table2->name } + if defined $self->_can_link->{ $table1->name }{ $table2->name }; if ( $self->is_data == 1 ) { - $self->{'can_link'}{ $table1->name }{ $table2->name } = [0]; - $self->{'can_link'}{ $table2->name }{ $table1->name } = [0]; - return $self->{'can_link'}{ $table1->name }{ $table2->name }; + $self->_can_link->{ $table1->name }{ $table2->name } = [0]; + $self->_can_link->{ $table2->name }{ $table1->name } = [0]; + return $self->_can_link->{ $table1->name }{ $table2->name }; } my %fk = (); @@ -666,40 +624,40 @@ Determine whether the table can link two arg tables via many-to-many. if ( !defined( $fk{ $table1->name } ) or !defined( $fk{ $table2->name } ) ) { - $self->{'can_link'}{ $table1->name }{ $table2->name } = [0]; - $self->{'can_link'}{ $table2->name }{ $table1->name } = [0]; - return $self->{'can_link'}{ $table1->name }{ $table2->name }; + $self->_can_link->{ $table1->name }{ $table2->name } = [0]; + $self->_can_link->{ $table2->name }{ $table1->name } = [0]; + return $self->_can_link->{ $table1->name }{ $table2->name }; } # trivial traversal, only one way to link the two tables if ( scalar( @{ $fk{ $table1->name } } == 1 ) and scalar( @{ $fk{ $table2->name } } == 1 ) ) { - $self->{'can_link'}{ $table1->name }{ $table2->name } = + $self->_can_link->{ $table1->name }{ $table2->name } = [ 'one2one', $fk{ $table1->name }, $fk{ $table2->name } ]; - $self->{'can_link'}{ $table1->name }{ $table2->name } = + $self->_can_link->{ $table1->name }{ $table2->name } = [ 'one2one', $fk{ $table2->name }, $fk{ $table1->name } ]; - # non-trivial traversal. one way to link table2, + # non-trivial traversal. one way to link table2, # many ways to link table1 } elsif ( scalar( @{ $fk{ $table1->name } } > 1 ) and scalar( @{ $fk{ $table2->name } } == 1 ) ) { - $self->{'can_link'}{ $table1->name }{ $table2->name } = + $self->_can_link->{ $table1->name }{ $table2->name } = [ 'many2one', $fk{ $table1->name }, $fk{ $table2->name } ]; - $self->{'can_link'}{ $table2->name }{ $table1->name } = + $self->_can_link->{ $table2->name }{ $table1->name } = [ 'one2many', $fk{ $table2->name }, $fk{ $table1->name } ]; - # non-trivial traversal. one way to link table1, + # non-trivial traversal. one way to link table1, # many ways to link table2 } elsif ( scalar( @{ $fk{ $table1->name } } == 1 ) and scalar( @{ $fk{ $table2->name } } > 1 ) ) { - $self->{'can_link'}{ $table1->name }{ $table2->name } = + $self->_can_link->{ $table1->name }{ $table2->name } = [ 'one2many', $fk{ $table1->name }, $fk{ $table2->name } ]; - $self->{'can_link'}{ $table2->name }{ $table1->name } = + $self->_can_link->{ $table2->name }{ $table1->name } = [ 'many2one', $fk{ $table2->name }, $fk{ $table1->name } ]; # non-trivial traversal. many ways to link table1 and table2 @@ -707,27 +665,22 @@ Determine whether the table can link two arg tables via many-to-many. elsif ( scalar( @{ $fk{ $table1->name } } > 1 ) and scalar( @{ $fk{ $table2->name } } > 1 ) ) { - $self->{'can_link'}{ $table1->name }{ $table2->name } = + $self->_can_link->{ $table1->name }{ $table2->name } = [ 'many2many', $fk{ $table1->name }, $fk{ $table2->name } ]; - $self->{'can_link'}{ $table2->name }{ $table1->name } = + $self->_can_link->{ $table2->name }{ $table1->name } = [ 'many2many', $fk{ $table2->name }, $fk{ $table1->name } ]; - # one of the tables didn't export a key + # one of the tables didn't export a key # to this table, no linking possible } else { - $self->{'can_link'}{ $table1->name }{ $table2->name } = [0]; - $self->{'can_link'}{ $table2->name }{ $table1->name } = [0]; + $self->_can_link->{ $table1->name }{ $table2->name } = [0]; + $self->_can_link->{ $table2->name }{ $table1->name } = [0]; } - return $self->{'can_link'}{ $table1->name }{ $table2->name }; + return $self->_can_link->{ $table1->name }{ $table2->name }; } -# ---------------------------------------------------------------------- -sub name { - -=pod - =head2 name Get or set the table's name. @@ -742,24 +695,24 @@ that name and disallows the change if one exists (setting the error to =cut +has name => ( + is => 'rw', + isa => sub { throw("No table name") unless $_[0] }, +); + +around name => sub { + my $orig = shift; my $self = shift; - if ( @_ ) { - my $arg = shift || return $self->error( "No table name" ); + if ( my ($arg) = @_ ) { if ( my $schema = $self->schema ) { return $self->error( qq[Can't use table name "$arg": table exists] ) if $schema->get_table( $arg ); } - $self->{'name'} = $arg; } - return $self->{'name'} || ''; -} - -# ---------------------------------------------------------------------- -sub schema { - -=pod + return ex2err($orig, $self, @_); +}; =head2 schema @@ -769,17 +722,10 @@ Get or set the table's schema object. =cut - my $self = shift; - if ( my $arg = shift ) { - return $self->error('Not a schema object') unless - UNIVERSAL::isa( $arg, 'SQL::Translator::Schema' ); - $self->{'schema'} = $arg; - } +has schema => ( is => 'rw', isa => schema_obj('Schema') ); - return $self->{'schema'}; -} +around schema => \&ex2err; -# ---------------------------------------------------------------------- sub primary_key { =pod @@ -812,7 +758,7 @@ These are eqivalent: my $constraint; if ( @$fields ) { for my $f ( @$fields ) { - return $self->error(qq[Invalid field "$f"]) unless + return $self->error(qq[Invalid field "$f"]) unless $self->get_field($f); } @@ -822,7 +768,7 @@ These are eqivalent: $has_pk = 1; $c->fields( @{ $c->fields }, @$fields ); $constraint = $c; - } + } } unless ( $has_pk ) { @@ -845,11 +791,6 @@ These are eqivalent: return; } -# ---------------------------------------------------------------------- -sub options { - -=pod - =head2 options Get or set the table's options (e.g., table types for MySQL). Returns @@ -859,23 +800,21 @@ an array or array reference. =cut +has options => ( + is => 'rw', + default => sub { [] }, + coerce => \&parse_list_arg, +); + +around options => sub { + my $orig = shift; my $self = shift; my $options = parse_list_arg( @_ ); - push @{ $self->{'options'} }, @$options; + push @{ $self->$orig }, @$options; - if ( ref $self->{'options'} ) { - return wantarray ? @{ $self->{'options'} || [] } : ($self->{'options'} || ''); - } - else { - return wantarray ? () : []; - } -} - -# ---------------------------------------------------------------------- -sub order { - -=pod + return wantarray ? @{ $self->$orig } : $self->$orig; +}; =head2 order @@ -885,33 +824,33 @@ Get or set the table's order. =cut - my ( $self, $arg ) = @_; +has order => ( is => 'rw', default => sub { 0 } ); + +around order => sub { + my ( $orig, $self, $arg ) = @_; if ( defined $arg && $arg =~ /^\d+$/ ) { - $self->{'order'} = $arg; + return $self->$orig($arg); } - return $self->{'order'} || 0; -} - -# ---------------------------------------------------------------------- -sub field_names { + return $self->$orig; +}; =head2 field_names Read-only method to return a list or array ref of the field names. Returns undef -or an empty list if the table has no fields set. Usefull if you want to +or an empty list if the table has no fields set. Useful if you want to avoid the overload magic of the Field objects returned by the get_fields method. my @names = $constraint->field_names; =cut +sub field_names { my $self = shift; - my @fields = + my @fields = map { $_->name } - sort { $a->order <=> $b->order } - values %{ $self->{'fields'} || {} }; + $self->get_fields; if ( @fields ) { return wantarray ? @fields : \@fields; @@ -922,7 +861,6 @@ avoid the overload magic of the Field objects returned by the get_fields method. } } -# ---------------------------------------------------------------------- sub equals { =pod @@ -938,7 +876,7 @@ Determines if this table 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 $case_insensitive ? uc($self->name) eq uc($other->name) : $self->name eq $other->name; return 0 unless $self->_compare_objects(scalar $self->options, scalar $other->options); @@ -948,14 +886,14 @@ Determines if this table is the same as another # Go through our fields my %checkedFields; foreach my $field ( $self->get_fields ) { - my $otherField = $other->get_field($field->name, $case_insensitive); - return 0 unless $field->equals($otherField, $case_insensitive); - $checkedFields{$field->name} = 1; + my $otherField = $other->get_field($field->name, $case_insensitive); + return 0 unless $field->equals($otherField, $case_insensitive); + $checkedFields{$field->name} = 1; } # Go through the other table's fields foreach my $otherField ( $other->get_fields ) { - next if $checkedFields{$otherField->name}; - return 0; + next if $checkedFields{$otherField->name}; + return 0; } # Constraints @@ -963,24 +901,24 @@ Determines if this table is the same as another my %checkedConstraints; CONSTRAINT: foreach my $constraint ( $self->get_constraints ) { - foreach my $otherConstraint ( $other->get_constraints ) { - if ( $constraint->equals($otherConstraint, $case_insensitive) ) { - $checkedConstraints{$otherConstraint} = 1; - next CONSTRAINT; - } - } - return 0; + foreach my $otherConstraint ( $other->get_constraints ) { + if ( $constraint->equals($otherConstraint, $case_insensitive) ) { + $checkedConstraints{$otherConstraint} = 1; + next CONSTRAINT; + } + } + return 0; } # Go through the other table's constraints CONSTRAINT2: foreach my $otherConstraint ( $other->get_constraints ) { - next if $checkedFields{$otherConstraint}; - foreach my $constraint ( $self->get_constraints ) { - if ( $otherConstraint->equals($constraint, $case_insensitive) ) { - next CONSTRAINT2; - } - } - return 0; + next if $checkedFields{$otherConstraint}; + foreach my $constraint ( $self->get_constraints ) { + if ( $otherConstraint->equals($constraint, $case_insensitive) ) { + next CONSTRAINT2; + } + } + return 0; } # Indices @@ -988,35 +926,33 @@ CONSTRAINT2: my %checkedIndices; INDEX: foreach my $index ( $self->get_indices ) { - foreach my $otherIndex ( $other->get_indices ) { - if ( $index->equals($otherIndex, $case_insensitive) ) { - $checkedIndices{$otherIndex} = 1; - next INDEX; - } - } - return 0; + foreach my $otherIndex ( $other->get_indices ) { + if ( $index->equals($otherIndex, $case_insensitive) ) { + $checkedIndices{$otherIndex} = 1; + next INDEX; + } + } + return 0; } # Go through the other table's indices INDEX2: foreach my $otherIndex ( $other->get_indices ) { - next if $checkedIndices{$otherIndex}; - foreach my $index ( $self->get_indices ) { - if ( $otherIndex->equals($index, $case_insensitive) ) { - next INDEX2; - } - } - return 0; + next if $checkedIndices{$otherIndex}; + foreach my $index ( $self->get_indices ) { + if ( $otherIndex->equals($index, $case_insensitive) ) { + next INDEX2; + } + } + return 0; } - return 1; + return 1; } -# ---------------------------------------------------------------------- - =head1 LOOKUP METHODS -The following are a set of shortcut methods for getting commonly used lists of -fields and constraints. They all return lists or array refs of Field or +The following are a set of shortcut methods for getting commonly used lists of +fields and constraints. They all return lists or array refs of Field or Constraint objects. =over 4 @@ -1060,7 +996,6 @@ sub pkey_fields { return wantarray ? @fields : \@fields; } -# ---------------------------------------------------------------------- sub fkey_fields { my $me = shift; my @fields; @@ -1068,14 +1003,12 @@ sub fkey_fields { return wantarray ? @fields : \@fields; } -# ---------------------------------------------------------------------- sub nonpkey_fields { my $me = shift; my @fields = grep { !$_->is_primary_key } $me->get_fields; return wantarray ? @fields : \@fields; } -# ---------------------------------------------------------------------- sub data_fields { my $me = shift; my @fields = @@ -1083,7 +1016,6 @@ sub data_fields { return wantarray ? @fields : \@fields; } -# ---------------------------------------------------------------------- sub unique_fields { my $me = shift; my @fields; @@ -1091,21 +1023,18 @@ sub unique_fields { return wantarray ? @fields : \@fields; } -# ---------------------------------------------------------------------- sub unique_constraints { my $me = shift; my @cons = grep { $_->type eq UNIQUE } $me->get_constraints; return wantarray ? @cons : \@cons; } -# ---------------------------------------------------------------------- sub fkey_constraints { my $me = shift; my @cons = grep { $_->type eq FOREIGN_KEY } $me->get_constraints; return wantarray ? @cons : \@cons; } -# ---------------------------------------------------------------------- sub DESTROY { my $self = shift; undef $self->{'schema'}; # destroy cyclical reference @@ -1114,9 +1043,10 @@ sub DESTROY { undef $_ for values %{ $self->{'fields'} }; } -1; +# Must come after all 'has' declarations +around new => \&ex2err; -# ---------------------------------------------------------------------- +1; =pod