From: Peter Rabbitson Date: Sun, 19 Jan 2014 11:39:28 +0000 (+0100) Subject: Fix ridiculous regex anchor mistake from 66137dffe X-Git-Tag: v0.08260~45 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1d1ccc948743c14f3ae557995e48c95186900352;p=dbsrgits%2FDBIx-Class.git Fix ridiculous regex anchor mistake from 66137dffe --- diff --git a/Changes b/Changes index bbffd09..1c55f07 100644 --- a/Changes +++ b/Changes @@ -30,7 +30,9 @@ Revision history for DBIx::Class - Fix 0.08250 regression in driver determination when DBI_DSN is used - Tests no longer fail if $ENV{DBI_DSN} is set - Throw clearer exception on ->new_related() with a non-existent - relationship. + relationship + - Fix incorrect parethesis unroll with multicolumn in, (never noticed + before fixing false positive in SQLA::Test 1.77) - Fix t/storage/replicated.t class loading problem - Stop using the deprecated Class::MOP::load_class() - Fix warning in t/54taint.t with explicitly unset PERL5LIB (RT#91972) diff --git a/Makefile.PL b/Makefile.PL index a1c08f8..b9d1661 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -80,7 +80,7 @@ my $runtime_requires = { 'namespace::clean' => '0.24', 'Path::Class' => '0.18', 'Scope::Guard' => '0.03', - 'SQL::Abstract' => '1.75', + 'SQL::Abstract' => '1.77', 'Try::Tiny' => '0.07', # Technically this is not a core dependency - it is only required diff --git a/lib/DBIx/Class/SQLMaker.pm b/lib/DBIx/Class/SQLMaker.pm index 0db6ef2..e863a0f 100644 --- a/lib/DBIx/Class/SQLMaker.pm +++ b/lib/DBIx/Class/SQLMaker.pm @@ -512,7 +512,7 @@ sub _where_op_multicolumn_in { for ($lhs, $rhs) { $$_->[0] = "( $$_->[0] )" - unless $$_->[0] =~ /^ \s* \( .* \) \s* ^/xs; + unless $$_->[0] =~ /^ \s* \( .* \) \s* $/xs; } \[ join( ' IN ', shift @$$lhs, shift @$$rhs ), @$$lhs, @$$rhs ];