From f8d97e749df641d0da641007bc6fda336defe71d Mon Sep 17 00:00:00 2001 From: Zbigniew Lukasiak Date: Thu, 21 May 2009 15:33:36 +0200 Subject: [PATCH] using _resolve_condition --- lib/DBIx/Class/ResultSet/RecursiveUpdate.pm | 11 ++++++++--- t/var/dvdzbr.db | Bin 36864 -> 37888 bytes 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm index c07ae6b..b4ba9b8 100644 --- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm +++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm @@ -2,7 +2,7 @@ use strict; use warnings; package DBIx::Class::ResultSet::RecursiveUpdate; -use version; our $VERSION = qv('0.007'); +use version; our $VERSION = qv('0.008'); use base qw(DBIx::Class::ResultSet); @@ -162,8 +162,13 @@ sub _update_relation { my ( $self, $name, $updates, $object, $info ) = @_; my $related_result = $self->related_resultset($name)->result_source->resultset; - my $resolved = - $self->result_source->resolve_condition( $info->{cond}, $name, $object ); + my $resolved; + if( $self->result_source->can( '_resolve_condition' ) ){ + $resolved = $self->result_source->_resolve_condition( $info->{cond}, $name, $object ); + } + else{ + $resolved = $self->result_source->resolve_condition( $info->{cond}, $name, $object ); + } # warn 'resolved: ' . Dumper( $resolved ); use Data::Dumper; $resolved = undef diff --git a/t/var/dvdzbr.db b/t/var/dvdzbr.db index fd45f65486b2e61b506888f0d3c7c97ccbbb49d2..5a07a70dbcebd4559d5904df0f966ca24beec97d 100644 GIT binary patch delta 1663 zcmb7^TTEO<7{|}dH+y#3>;eMIvddc5b)i(Q3zX&B7P&}4v=lI05)rcmkhR+iw7aZL zm`P*XG$F!gt%=v54^0}=%6Tyh$l zGynX*-#2sb(YcHCRd)tFqikzrWudqsi@};cnhzWBEBpj&un3EIjg@_LsS$GIM4srD zeXi(~y;U^Jo{8Ee#;kVvO5m;ncQvc!XQ(g{AcUCoVIZptS)~_1-TZwH0)(70w0S%h zb>m-A3!a#tWaZALTnzYg@KikA~}1JETJQQO@GF|iM?%*;};A4~j2Fdz=#NM|;> z11(fE$yX;H52O(%z7nXS;&HqhI88+}4t2zr3z?-PX^)aCrMqRgU;$o}|0ZRiMRf)< z$%%<0q0wmQcxaeg2MuoIKNR2&)!CXy6nzCR;uY98Q~(iPjW5g|qdaI>JZ>)GHLAfq z=9}QPcp+Z0Wgdii9bS)?Zh6P+6W;NLP4BAB$qbUEDz@ln83cY&Gs#dmWSgA_%Lva+N(1ZO-&ayFxyWYw9-;+bBp_qh+iZ)UOxWiyD>@pH+r z|BD}bLKBP^iP9ugq9Os6s5I!5P>CvIx+GL$@3wsTAS|l4L-k-m27S6dLiAg~qAV%O z60wmO`Hn{EMR3E495$h6e8MZ`q?w(WnM5=u%5rAvCHZ)o54Se;wvLGwT&)qsYrs3_GBm5LfN14sKcmzH+Mnkr!+VpekI^xOj?v#B9~Nkc-h`06Uar6jUC1yi j@|qKe4H<3JGycCMs-kfQmi?75={goMzpJ delta 1418 zcmZuweN0u@XQGWhsNweV_xzVvX%W z_!v4$PncWcA7uK6k;DKmVKgcUYSbAPA(;tAlcF(36QgV~GvLC!x4_mV-uB&hzV12q zoZs*HK9GFVQXnOXjFLy!(aGF$Go`nMHJ$!T?{aa525AtNS^nJ25sGgn#3XX3#lp9E zBi{`AYm6BTTmrgH=(c81{-XG8i436KA1MS}Wuv(Mnvr>7LqVs>jH@Z>lMOPiOr$c0 zur0F!{3XwZy(Y$es_Yd^D1vF}DmBn1I!AK&FR}_gTT~i?A%(Y+6Qi?K zTG8LHV)~N`K0lz>^AP5L5qQ;G+Ue>OfQ|5~R4e236Lt7uU#nEF$C|AA`9n-eiXp9p z|GxtXUV%l)E-hhC|6O#~C16YTGw7^SaUnYq67kFI!w`q}vPZDB)+==-VA^0eHz&G1 zU_`ImbL}t-HmjOinh6K5i=KBcN{EgNu%`s3@FROSE(|wdT16A&;ipy4%7LknqC=A@ zQ+8e!QsJ?>$JXBtDb~nAx__3$VTLJLK6)vnNH}N8jGMk1Qk;<(87A#2ZdAzd0`8cK zaJ7Wtt(SA>%VU`qJDMfHtkwqYqX~w15zpB{Z)=8zU#YD#9%wo^I?wjmPIsK@gk3^x z61vH&@L0|0_?Z@_LsSTe9D1@y$Rbq3IrvQ)lU8UW@e@B>aKHR+V$~!{h_~XjBA@(8iDy~(S*~LBJWilR8 zDsk;trsTVz?U*tIzNgHt0av@*HQ0WG_u6}5@4K^^%(D1Smh% zAQbdWv<7&8+{(`J(P3)0n`g`cPP6hH^BO0x;Bz#m@g+~!ZsW6LBGOpR|3uC5TL>JA z`7=B95Cd^wJxbq~#d}}=`g7fah?||lrIbrjhm2{%Y4i|j)Rx&eZK6Gm=ilil;|3e{-2M@8u&=yltAx q_b$cN0j2{gAlD2-e?EX)4murt5I<@KW8X-)Jz~@hZ~aXr8U6zTDTd$x -- 2.45.2