use warnings;
use strict;
-use constant SPURIOUS_VERSION_CHECK_WARNINGS => ( "$]" < 5.010 ? 1 : 0);
-
my $mro_recursor_stack;
BEGIN {
use Config;
use constant {
+ PERL_VERSION => "$]",
+ OS_NAME => "$^O",
+ };
+
+ use constant {
# but of course
- BROKEN_FORK => ($^O eq 'MSWin32') ? 1 : 0,
+ BROKEN_FORK => (OS_NAME eq 'MSWin32') ? 1 : 0,
- BROKEN_GOTO => ( "$]" < 5.008003 ) ? 1 : 0,
+ BROKEN_GOTO => ( PERL_VERSION < 5.008003 ) ? 1 : 0,
+
+ # perl -MScalar::Util=weaken -e 'weaken( $hash{key} = \"value" )'
+ BROKEN_WEAK_SCALARREF_VALUES => ( PERL_VERSION < 5.008003 ) ? 1 : 0,
HAS_ITHREADS => $Config{useithreads} ? 1 : 0,
- UNSTABLE_DOLLARAT => ( "$]" < 5.013002 ) ? 1 : 0,
+ UNSTABLE_DOLLARAT => ( PERL_VERSION < 5.013002 ) ? 1 : 0,
( map
#
),
IV_SIZE => $Config{ivsize},
-
- OS_NAME => $^O,
};
- if ( "$]" < 5.009_005) {
+ if ( PERL_VERSION < 5.009_005) {
require MRO::Compat;
constant->import( OLD_MRO => 1 );
( $mro_recursor_stack->{cache} || {} )->{$_}{methlist} ||= do {
my $class = $_;
-
no strict 'refs';
- my %methlist =
+
+ # RV to be hashed up and turned into a number
+ join "\0", (
+ $class,
map
- # this is essentially a uniq_by step
- # it is crucial on OLD_MRO
- {( Scalar::Util::refaddr($_) => $_ )}
+ {(
+ # stringification should be sufficient, ignore names/refaddr entirely
+ $_,
+ attributes::get( $_ ),
+ )}
map
- {
+ {(
+ # skip dummy C::C3 helper crefs
+ ! ( ( $Class::C3::MRO{$class} || {} )->{methods}{$_} )
+ and
(
ref(\ "${class}::"->{$_} ) ne 'GLOB'
or
defined( *{ "${class}::"->{$_} }{CODE} )
)
+ )
? ( \&{"${class}::$_"} )
: ()
}
keys %{ "${class}::" }
- ;
-
- # RV to be hashed up and turned into a number
- join "\0", (
- $class,
- map {(
- $_, # refaddr is sufficient, ignore names entirely
- attributes::get( $methlist{$_} )
- )} sort keys %methlist
- ),
+ );
}
} (
sub PEEPEENESS () { &$sigh }
}
+use constant SPURIOUS_VERSION_CHECK_WARNINGS => ( DBIx::Class::_ENV_::PERL_VERSION < 5.010 ? 1 : 0);
+
# FIXME - this is not supposed to be here
# Carp::Skip to the rescue soon
use DBIx::Class::Carp '^DBIx::Class|^DBICTest';
use constant UNRESOLVABLE_CONDITION => \ '1 = 0';
-BEGIN {
- # add preliminary attribute support
- # FIXME FIXME FIXME
- # To be revisited when Moo with proper attr support ships
- Sub::Quote->VERSION(2.002);
-}
# Override forcing no_defer, and adding naming consistency checks
+our %refs_closed_over_by_quote_sub_installed_crefs;
sub quote_sub {
- Carp::confess( "Anonymous quoting not supported by the DBIC sub_quote override - supply a sub name" ) if
+ Carp::confess( "Anonymous quoting not supported by the DBIC quote_sub override - supply a sub name" ) if
@_ < 2
or
! defined $_[1]
length ref $_[1]
;
- Carp::confess( "The DBIC sub_quote override expects sub name '$_[0]' to be fully qualified" )
- unless $_[0] =~ /::/;
+ Carp::confess( "The DBIC quote_sub override expects sub name '$_[0]' to be fully qualified" )
+ unless (my $stash) = $_[0] =~ /^(.+)::/;
+
+ Carp::confess(
+ "The DBIC sub_quote override does not support 'no_install'"
+ ) if (
+ $_[3]
+ and
+ $_[3]->{no_install}
+ );
- Carp::confess( "The DBIC sub_quote override expects the sub name '$_[0]' to match the supplied 'package' argument" ) if
+ Carp::confess(
+ 'The DBIC quote_sub override expects the namespace-part of sub name '
+ . "'$_[0]' to match the supplied package argument '$_[3]->{package}'"
+ ) if (
$_[3]
and
defined $_[3]->{package}
and
- index( $_[0], $_[3]->{package} ) != 0
- ;
+ $stash ne $_[3]->{package}
+ );
my @caller = caller(0);
my $sq_opts = {
no_defer => 1,
};
- my $cref = Sub::Quote::quote_sub( $_[0], $_[1], $_[2]||{}, $sq_opts );
-
- # FIXME FIXME FIXME
- # To be revisited when Moo with proper attr support ships
- if(
- # external application does not work on things like :prototype(...), :lvalue, etc
- my @attrs = grep {
- $_ !~ /^[a-z]/
+ weaken (
+ # just use a growing counter, no need to perform neither compaction
+ # nor any special ithread-level handling
+ $refs_closed_over_by_quote_sub_installed_crefs
+ { scalar keys %refs_closed_over_by_quote_sub_installed_crefs }
+ = $_
+ ) for grep {
+ length ref $_
+ and
+ (
+ ! DBIx::Class::_ENV_::BROKEN_WEAK_SCALARREF_VALUES
or
- Carp::confess( "The DBIC sub_quote override does not support applying of reserved attribute '$_'" )
- } @{ $sq_opts->{attributes} || []}
- ) {
- Carp::confess( "The DBIC sub_quote override does not allow mixing 'attributes' with 'no_install'" )
- if $sq_opts->{no_install};
-
- # might be different from $sq_opts->{package};
- my ($install_into) = $_[0] =~ /(.+)::[^:]+$/;
-
- attributes->import( $install_into, $cref, @attrs );
- }
+ ref $_ ne 'SCALAR'
+ )
+ } values %{ $_[2] || {} };
- $cref;
+ Sub::Quote::quote_sub( $_[0], $_[1], $_[2]||{}, $sq_opts );
}
sub sigwarn_silencer ($) {
our $describe_class_query_cache;
sub describe_class_methods {
- my ($class) = @_;
+ my ($class, $requested_mro) = @_;
croak "Expecting a class name"
if not defined $class or $class !~ $module_name_rx;
+ $requested_mro ||= mro::get_mro($class);
+
+ # mro::set_mro() does not bump pkg_gen - WHAT THE FUCK?!
+ my $query_cache_key = "$class|$requested_mro";
+
+ my $stack_cache_key =
+ ( mro::get_mro($class) eq $requested_mro )
+ ? $class
+ : $query_cache_key
+ ;
+
# use a cache on old MRO, since while we are recursing in this function
# nothing can possibly change (the speedup is immense)
# (yes, people could be tie()ing the stash and adding methods on access
$my_gen += get_real_pkg_gen($_) for ( my @full_ISA = (
@{
- $mro_recursor_stack->{cache}{$class}{linear_isa}
+ $mro_recursor_stack->{cache}{$stack_cache_key}{linear_isa}
||=
- mro::get_linear_isa($class)
+ mro::get_linear_isa($class, $requested_mro)
},
((
));
- my $slot = $describe_class_query_cache->{$class} ||= {};
+ my $slot = $describe_class_query_cache->{$query_cache_key} ||= {};
unless ( ($slot->{cumulative_gen}||0) == $my_gen ) {
%$slot = (
class => $class,
isa => [
- @{ $mro_recursor_stack->{cache}{$class}{linear_isa} }
- [ 1 .. $#{$mro_recursor_stack->{cache}{$class}{linear_isa}} ]
+ @{ $mro_recursor_stack->{cache}{$stack_cache_key}{linear_isa} }
+ [ 1 .. $#{$mro_recursor_stack->{cache}{$stack_cache_key}{linear_isa}} ]
],
mro => {
- type => mro::get_mro($class),
+ type => $requested_mro,
+ is_c3 => ( ($requested_mro eq 'c3') ? 1 : 0 ),
},
cumulative_gen => $my_gen,
);
- $slot->{mro}{is_c3} = ($slot->{mro}{type} eq 'c3') ? 1 : 0;
# ensure the cache is populated for the parents, code below can then
# efficiently operate over the query_cache directly
describe_class_methods($_) for reverse @full_ISA;
- my ($methods_seen_via_ISA_on_old_mro, $current_node_refaddr);
no strict 'refs';
# combine full ISA-order inherited and local method list into a
# "shadowing stack"
(
- $current_node_refaddr = refaddr($_)
-
- and
-
unshift @{ $slot->{methods}{$_->{name}} }, $_
and
# what describe_class_methods for @full_ISA produced above
( map { values %{
$describe_class_query_cache->{$_}{methods_defined_in_class} || {}
- } } reverse @full_ISA ),
+ } } map { "$_|" . mro::get_mro($_) } reverse @full_ISA ),
# our own non-cleaned subs + their attributes
( map {
(
- # these 2 OR-ed checks are sufficient for 5.10+
+ # need to account for dummy helper crefs under OLD_MRO
(
- ref(\ "${class}::"->{$_} ) ne 'GLOB'
+ ! DBIx::Class::_ENV_::OLD_MRO
or
- defined( *{ "${class}::"->{$_} }{CODE} )
+ ! ( ( $Class::C3::MRO{$class} || {} )->{methods}{$_} )
)
and
- # need to account for dummy helper crefs under OLD_MRO
+ # these 2 OR-ed checks are sufficient for 5.10+
(
- ! DBIx::Class::_ENV_::OLD_MRO
+ ref(\ "${class}::"->{$_} ) ne 'GLOB'
or
- (
- $methods_seen_via_ISA_on_old_mro ||= do {
- my $rv = {};
- $rv->{$_->{name}}->{ refaddr( \&{ "$_->{via_class}::$_->{name}"} ) } = 1 for
- map { @$_ } map
- { values %{ $describe_class_query_cache->{$_}{methods} } }
- @full_ISA;
- $rv;
- }
- and
- (
- ! $methods_seen_via_ISA_on_old_mro->{$_}
- or
- ! $methods_seen_via_ISA_on_old_mro->{$_}{ refaddr( \&{"${class}::${_}"} ) }
- )
- )
+ defined( *{ "${class}::"->{$_} }{CODE} )
)
) ? {
via_class => $class,
projects / dbsrgits/DBIx-Class.git / blobdiff