Skip to content
Browse files

Regex /o is *EVIL* - no idea why I even thought of using that

  • Loading branch information...
1 parent e0de554 commit 569b96bba24cd24097c3496d6c6da02498933190 @ribasushi ribasushi committed Feb 18, 2013
Showing with 6 additions and 5 deletions.
  1. +1 −0 Changes
  2. +3 −3 lib/DBIx/Class/Carp.pm
  3. +2 −2 t/99dbic_sqlt_parser.t
View
1 Changes
@@ -7,6 +7,7 @@ Revision history for DBIx::Class
* Fixes
- Fix another embarrassing regression preventing correct refining of
the search criteria on a prefetched relation (broken in 0.08205)
+ - Fix incorrect callsite reporting by DBIC::Carp
0.08208 2013-02-20 09:56 (UTC)
* New Features / Changes
View
6 lib/DBIx/Class/Carp.pm
@@ -30,7 +30,7 @@ sub __find_caller {
my $fr_num = 1; # skip us and the calling carp*
my @f;
while (@f = caller($fr_num++)) {
- last unless $f[0] =~ $skip_pattern;
+ last if $f[0] !~ $skip_pattern;
if (
$f[0]->can('_skip_namespace_frames')
@@ -69,8 +69,8 @@ sub import {
my $into = caller;
$skip_pattern = $skip_pattern
- ? qr/ ^ $into $ | $skip_pattern /xo
- : qr/ ^ $into $ /xo
+ ? qr/ ^ $into $ | $skip_pattern /x
+ : qr/ ^ $into $ /x
;
no strict 'refs';
View
4 t/99dbic_sqlt_parser.t
@@ -34,7 +34,7 @@ BEGIN {
push @schemas, create_schema({
args => { parser_args => { $parser_args_key => $s } }
});
- } qr/\Qparser_args => {\E.+?is deprecated/,
+ } qr/\Qparser_args => {\E.+?is deprecated.+\Q@{[__FILE__]}/,
"deprecated crazy parser_arg '$parser_args_key' warned";
}
@@ -65,7 +65,7 @@ SKIP: {
parser => 'SQL::Translator::Parser::YAML'
)->translate(
data => SQL::Translator->new(
- parser_args => { package => $s },
+ parser_args => { dbic_schema => $s },
parser => 'SQL::Translator::Parser::DBIx::Class',
producer => 'SQL::Translator::Producer::YAML',
)->translate

0 comments on commit 569b96b

Please sign in to comment.
Something went wrong with that request. Please try again.