X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FResultSourceProxy%2FTable.pm;h=8b63593cc631c073a76195bbb14186e29ffd91d6;hb=4376a1574bc5b25f4b9160e8fc3ce329ae226e0f;hp=db82b4790f505df2677a4779d15cd81d356a5952;hpb=6ca5c92b53be82e8898c2da3dda0cb5e5cde5674;p=dbsrgits%2FDBIx-Class-Historic.git diff --git a/lib/DBIx/Class/ResultSourceProxy/Table.pm b/lib/DBIx/Class/ResultSourceProxy/Table.pm index db82b47..8b63593 100644 --- a/lib/DBIx/Class/ResultSourceProxy/Table.pm +++ b/lib/DBIx/Class/ResultSourceProxy/Table.pm @@ -6,7 +6,8 @@ use warnings; use base qw/DBIx::Class::ResultSourceProxy/; use DBIx::Class::ResultSource::Table; -use Scalar::Util (); +use Scalar::Util 'blessed'; +use namespace::clean; __PACKAGE__->mk_classdata(table_class => 'DBIx::Class::ResultSource::Table'); @@ -80,17 +81,18 @@ sub table { my ($class, $table) = @_; return $class->result_source_instance->name unless $table; - unless (Scalar::Util::blessed($table) && $table->isa($class->table_class)) { + unless (blessed $table && $table->isa($class->table_class)) { my $table_class = $class->table_class; $class->ensure_class_loaded($table_class); $table = $table_class->new({ - $class->can('result_source_instance') ? - %{$class->result_source_instance||{}} : (), + $class->can('result_source_instance') + ? %{$class->result_source_instance||{}} + : () + , name => $table, result_class => $class, - source_name => undef, }); }