From: Justin Guenther Date: Fri, 24 Mar 2006 06:01:55 +0000 (+0000) Subject: code reformatting for readibility X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=aa1088bf7ed82084a2d4b2ca957650a15a294ab4;p=dbsrgits%2FDBIx-Class-Historic.git code reformatting for readibility --- diff --git a/lib/DBIx/Class/AccessorGroup.pm b/lib/DBIx/Class/AccessorGroup.pm index a4ceff8..b8079fc 100644 --- a/lib/DBIx/Class/AccessorGroup.pm +++ b/lib/DBIx/Class/AccessorGroup.pm @@ -277,7 +277,9 @@ sub set_component_class { return $self->{$set} = $val; } else { $set = "_$set"; - return $self->can($set) ? $self->$set($val) : $self->mk_classdata($set => $val); + return $self->can($set) ? + $self->$set($val) : + $self->mk_classdata($set => $val); } } diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm index 8647918..9de8790 100644 --- a/lib/DBIx/Class/ResultSet.pm +++ b/lib/DBIx/Class/ResultSet.pm @@ -56,9 +56,9 @@ In the examples below, the following table classes are used: =head3 Arguments: ($source, \%$attrs) The resultset constructor. Takes a source object (usually a -L) and an attribute hash (see L -below). Does not perform any queries -- these are executed as needed by the -other methods. +L) and an attribute hash (see +L below). Does not perform any queries -- these are +executed as needed by the other methods. Generally you won't need to construct a resultset manually. You'll automatically get one from e.g. a L called in scalar context: @@ -80,9 +80,12 @@ sub new { $attrs->{columns} ||= delete $attrs->{cols} if $attrs->{cols}; delete $attrs->{as} if $attrs->{columns}; $attrs->{columns} ||= [ $source->columns ] unless $attrs->{select}; - $attrs->{select} = [ map { m/\./ ? $_ : "${alias}.$_" } @{delete $attrs->{columns}} ] - if $attrs->{columns}; - $attrs->{as} ||= [ map { m/^\Q$alias.\E(.+)$/ ? $1 : $_ } @{$attrs->{select}} ]; + $attrs->{select} = [ + map { m/\./ ? $_ : "${alias}.$_" } @{delete $attrs->{columns}} + ] if $attrs->{columns}; + $attrs->{as} ||= [ + map { m/^\Q$alias.\E(.+)$/ ? $1 : $_ } @{$attrs->{select}} + ]; if (my $include = delete $attrs->{include_columns}) { push(@{$attrs->{select}}, @$include); push(@{$attrs->{as}}, map { m/([^.]+)$/; $1; } @$include); @@ -100,11 +103,14 @@ sub new { $seen{$j} = 1; } } - push(@{$attrs->{from}}, $source->resolve_join($join, $attrs->{alias}, $attrs->{seen_join})); + push(@{$attrs->{from}}, $source->resolve_join( + $join, $attrs->{alias}, $attrs->{seen_join}) + ); } $attrs->{group_by} ||= $attrs->{select} if delete $attrs->{distinct}; - $attrs->{order_by} = [ $attrs->{order_by} ] if $attrs->{order_by} and !ref($attrs->{order_by}); + $attrs->{order_by} = [ $attrs->{order_by} ] if + $attrs->{order_by} and !ref($attrs->{order_by}); $attrs->{order_by} ||= []; my $collapse = $attrs->{collapse} || {}; @@ -254,13 +260,15 @@ sub find { my @cols = $self->result_source->primary_columns; if (exists $attrs->{key}) { my %uniq = $self->result_source->unique_constraints; - $self->throw_exception( "Unknown key $attrs->{key} on '" . $self->result_source->name . "'" ) - unless exists $uniq{$attrs->{key}}; + $self->throw_exception( + "Unknown key $attrs->{key} on '" . $self->result_source->name . "'" + ) unless exists $uniq{$attrs->{key}}; @cols = @{ $uniq{$attrs->{key}} }; } #use Data::Dumper; warn Dumper($attrs, @vals, @cols); - $self->throw_exception( "Can't find unless a primary key or unique constraint is defined" ) - unless @cols; + $self->throw_exception( + "Can't find unless a primary key or unique constraint is defined" + ) unless @cols; my $query; if (ref $vals[0] eq 'HASH') { @@ -280,7 +288,9 @@ sub find { my $rs = $self->search($query,$attrs); return keys %{$rs->{collapse}} ? $rs->next : $rs->single; } else { - return keys %{$self->{collapse}} ? $self->search($query)->next : $self->single($query); + return keys %{$self->{collapse}} ? + $self->search($query)->next : + $self->single($query); } } @@ -397,9 +407,10 @@ sub next { $self->{all_cache_position} = 1; return ($self->all)[0]; } - my @row = (exists $self->{stashed_row} - ? @{delete $self->{stashed_row}} - : $self->cursor->next); + my @row = (exists $self->{stashed_row} ? + @{delete $self->{stashed_row}} : + $self->cursor->next + ); # warn Dumper(\@row); use Data::Dumper; return unless (@row); return $self->_construct_object(@row); @@ -452,10 +463,15 @@ sub _collapse_result { } } - my @collapse = (defined($prefix) - ? (map { (m/^\Q${prefix}.\E(.+)$/ ? ($1) : ()); } - keys %{$self->{collapse}}) - : keys %{$self->{collapse}}); + my @collapse; + if (defined $prefix) { + @collapse = map { + m/^\Q${prefix}.\E(.+)$/ ? ($1) : () + } keys %{$self->{collapse}}) + } else { + @collapse = keys %{$self->{collapse}}; + ); + if (@collapse) { my ($c) = sort { length $a <=> length $b } @collapse; my $target = $info; @@ -468,8 +484,8 @@ sub _collapse_result { my $tree = $self->_collapse_result($as, $row, $c_prefix); my (@final, @raw); while ( !(grep { - !defined($tree->[0]->{$_}) - || $co_check{$_} ne $tree->[0]->{$_} + !defined($tree->[0]->{$_}) || + $co_check{$_} ne $tree->[0]->{$_} } @co_key) ) { push(@final, $tree); last unless (@raw = $self->cursor->next); @@ -625,7 +641,8 @@ Sets the specified columns in the resultset to the supplied values. sub update { my ($self, $values) = @_; - $self->throw_exception("Values for update must be a hash") unless ref $values eq 'HASH'; + $self->throw_exception("Values for update must be a hash") + unless ref $values eq 'HASH'; return $self->result_source->storage->update( $self->result_source->from, $values, $self->{cond}); } @@ -641,7 +658,8 @@ will run cascade triggers while L will not. sub update_all { my ($self, $values) = @_; - $self->throw_exception("Values for update must be a hash") unless ref $values eq 'HASH'; + $self->throw_exception("Values for update must be a hash") + unless ref $values eq 'HASH'; foreach my $obj ($self->all) { $obj->set_columns($values)->update; } @@ -719,7 +737,8 @@ sense for queries with a C attribute. sub pager { my ($self) = @_; my $attrs = $self->{attrs}; - $self->throw_exception("Can't create pager for non-paged rs") unless $self->{page}; + $self->throw_exception("Can't create pager for non-paged rs") + unless $self->{page}; $attrs->{rows} ||= 10; return $self->{pager} ||= Data::Page->new( $self->_count, $attrs->{rows}, $self->{page}); @@ -752,8 +771,9 @@ sub new_result { my ($self, $values) = @_; $self->throw_exception( "new_result needs a hash" ) unless (ref $values eq 'HASH'); - $self->throw_exception( "Can't abstract implicit construct, condition not a hash" ) - if ($self->{cond} && !(ref $self->{cond} eq 'HASH')); + $self->throw_exception( + "Can't abstract implicit construct, condition not a hash" + ) if ($self->{cond} && !(ref $self->{cond} eq 'HASH')); my %new = %$values; my $alias = $self->{attrs}{alias}; foreach my $key (keys %{$self->{cond}||{}}) { @@ -776,7 +796,8 @@ Effectively a shortcut for C<< ->new_result(\%vals)->insert >>. sub create { my ($self, $attrs) = @_; - $self->throw_exception( "create needs a hashref" ) unless ref $attrs eq 'HASH'; + $self->throw_exception( "create needs a hashref" ) + unless ref $attrs eq 'HASH'; return $self->new_result($attrs)->insert; } @@ -896,7 +917,8 @@ sub get_cache { =head2 set_cache -Sets the contents of the cache for the resultset. Expects an arrayref of objects of the same class as those produced by the resultset. +Sets the contents of the cache for the resultset. Expects an arrayref +of objects of the same class as those produced by the resultset. =cut @@ -906,8 +928,9 @@ sub set_cache { if ref $data ne 'ARRAY'; my $result_class = $self->result_class; foreach( @$data ) { - $self->throw_exception("cannot cache object of type '$_', expected '$result_class'") - if ref $_ ne $result_class; + $self->throw_exception( + "cannot cache object of type '$_', expected '$result_class'" + ) if ref $_ ne $result_class; } $self->{all_cache} = $data; } diff --git a/lib/DBIx/Class/ResultSource.pm b/lib/DBIx/Class/ResultSource.pm index 1a78f29..bdf01f1 100644 --- a/lib/DBIx/Class/ResultSource.pm +++ b/lib/DBIx/Class/ResultSource.pm @@ -10,9 +10,12 @@ use Storable; use base qw/DBIx::Class/; __PACKAGE__->load_components(qw/AccessorGroup/); -__PACKAGE__->mk_group_accessors('simple' => - qw/_ordered_columns _columns _primaries _unique_constraints name resultset_attributes schema from _relationships/); -__PACKAGE__->mk_group_accessors('component_class' => qw/resultset_class result_class/); +__PACKAGE__->mk_group_accessors('simple' => qw/_ordered_columns + _columns _primaries _unique_constraints name resultset_attributes + schema from _relationships/); + +__PACKAGE__->mk_group_accessors('component_class' => qw/resultset_class + result_class/); =head1 NAME @@ -196,7 +199,9 @@ Returns all column names in the order they were declared to add_columns sub columns { my $self = shift; - $self->throw_exception("columns() is a read-only accessor, did you mean add_columns()?") if (@_ > 1); + $self->throw_exception( + "columns() is a read-only accessor, did you mean add_columns()?" + ) if (@_ > 1); return @{$self->{_ordered_columns}||[]}; }