X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FCDBICompat%2FImaDBI.pm;h=896eca741b39a8c16f1c2ee8f692bd20a5f039cb;hb=ddc0a6c89d212433eb5716b2aa963f63b1f348d1;hp=346c52fe3bb96fa37c0fa4d1566ed19ab212e207;hpb=c959e8d06362537fbc865d703786b399d0806212;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/CDBICompat/ImaDBI.pm b/lib/DBIx/Class/CDBICompat/ImaDBI.pm index 346c52f..896eca7 100644 --- a/lib/DBIx/Class/CDBICompat/ImaDBI.pm +++ b/lib/DBIx/Class/CDBICompat/ImaDBI.pm @@ -4,6 +4,7 @@ package # hide from PAUSE use strict; use warnings; use DBIx::ContextualFetch; +use Sub::Name (); use base qw/DBIx::Class/; @@ -79,18 +80,21 @@ sub __driver { sub set_sql { my ($class, $name, $sql) = @_; no strict 'refs'; - *{"${class}::sql_${name}"} = + my $sql_name = "sql_${name}"; + my $full_sql_name = join '::', $class, $sql_name; + *$full_sql_name = Sub::Name::subname $full_sql_name, sub { my $sql = $sql; my $class = shift; return $class->storage->sth($class->transform_sql($sql, @_)); }; if ($sql =~ /select/i) { - my $meth = "sql_${name}"; - *{"${class}::search_${name}"} = + my $search_name = "search_${name}"; + my $full_search_name = join '::', $class, $search_name; + *$full_search_name = Sub::Name::subname $full_search_name, sub { my ($class, @args) = @_; - my $sth = $class->$meth; + my $sth = $class->$sql_name; return $class->sth_to_objects($sth, \@args); }; }