X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FRelBuilder.pm;h=4fdbf63f0e4f1c9f7d1f093a4382e7ad05025cef;hb=refs%2Ftags%2F0.07013;hp=14f618de8fd628e648821700410d4eec8bf68e6e;hpb=8e6c80c9ded48d2f9450de4200c4490b13d0c942;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm index 14f618d..4fdbf63 100644 --- a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm +++ b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm @@ -6,7 +6,7 @@ use base 'Class::Accessor::Grouped'; use mro 'c3'; use Carp::Clan qw/^DBIx::Class/; use Scalar::Util 'weaken'; -use DBIx::Class::Schema::Loader::Utils qw/split_name slurp_file/; +use DBIx::Class::Schema::Loader::Utils qw/split_name slurp_file array_eq/; use Try::Tiny; use List::MoreUtils qw/apply uniq any/; use namespace::clean; @@ -17,7 +17,7 @@ use String::ToIdentifier::EN::Unicode (); use Class::Unload (); use Class::Inspector (); -our $VERSION = '0.07011'; +our $VERSION = '0.07013'; # Glossary: # @@ -276,17 +276,6 @@ sub _strip_id_postfix { return $name; } -sub _array_eq { - my ($self, $a, $b) = @_; - - return unless @$a == @$b; - - for (my $i = 0; $i < @$a; $i++) { - return unless $a->[$i] eq $b->[$i]; - } - return 1; -} - sub _remote_attrs { my ($self, $local_moniker, $local_cols) = @_; @@ -685,8 +674,8 @@ sub _relnames_and_method { my $remote_method = 'has_many'; # If the local columns have a UNIQUE constraint, this is a one-to-one rel - if ($self->_array_eq([ $local_source->primary_columns ], $local_cols) || - grep { $self->_array_eq($_->[1], $local_cols) } @$uniqs) { + if (array_eq([ $local_source->primary_columns ], $local_cols) || + grep { array_eq($_->[1], $local_cols) } @$uniqs) { $remote_method = 'might_have'; ($local_relname) = $self->_inflect_singular($local_relname_uninflected); } @@ -716,7 +705,7 @@ sub _relnames_and_method { my $rel_cols = [ sort { $a cmp $b } apply { s/^foreign\.//i } (keys %{ $class->relationship_info($local_relname)->{cond} }) ]; - $relationship_exists = 1 if $self->_array_eq([ sort @$local_cols ], $rel_cols); + $relationship_exists = 1 if array_eq([ sort @$local_cols ], $rel_cols); } }