X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F04modifiers.t;h=a3ac721c92a126ccd9f002b8434863196cdf3279;hb=428975b0e646c0769d7eb530d4f52443471a9a9a;hp=cce81f28acc58d9bd0666f84a99aee478c5421c6;hpb=ce261791e61ffd1bd7b4e5e27582fbcfbfbfad3a;p=dbsrgits%2FSQL-Abstract.git diff --git a/t/04modifiers.t b/t/04modifiers.t index cce81f2..a3ac721 100644 --- a/t/04modifiers.t +++ b/t/04modifiers.t @@ -8,7 +8,15 @@ use SQL::Abstract::Test import => ['is_same_sql_bind']; use Data::Dumper; use SQL::Abstract; -use Clone; +use Storable 'dclone'; + +#### WARNING #### +# +# -nest has been undocumented on purpose, but is still supported for the +# foreseable future. Do not rip out the -nest tests before speaking to +# someone on the DBIC mailing list or in irc.perl.org#dbix-class +# +################# =begin Test -and -or and -nest modifiers, assuming the following: @@ -17,7 +25,7 @@ Test -and -or and -nest modifiers, assuming the following: limitation of one modifier type per hahsref) * When in condition context i.e. where => { -or { a = 1 } }, each modifier affects only the immediate element following it. - * When in column multi-condition context i.e. + * When in column multi-condition context i.e. where => { x => { '!=', [-and, [qw/1 2 3/]] } }, a modifier affects the OUTER ARRAYREF if and only if it is the first element of said ARRAYREF @@ -68,7 +76,7 @@ my @and_or_tests = ( %{$and_or_args->{or}}, }, - # test modifiers within hashrefs + # test modifiers within hashrefs { where => { -or => [ [ foo => 1, bar => 2 ], @@ -84,7 +92,7 @@ my @and_or_tests = ( %{$and_or_args->{or_and}}, }, - # test modifiers within arrayrefs + # test modifiers within arrayrefs { where => [ -or => [ [ foo => 1, bar => 2 ], @@ -162,8 +170,8 @@ my @and_or_tests = ( # the -and should affect the OUTER arrayref, while the internal structures remain intact { - where => { x => [ - -and => [ 1, 2 ], { -like => 'x%' } + where => { x => [ + -and => [ 1, 2 ], { -like => 'x%' } ]}, stmt => 'WHERE (x = ? OR x = ?) AND x LIKE ?', bind => [qw/1 2 x%/], @@ -209,7 +217,7 @@ my @and_or_tests = ( bind => [1 .. 13], }, - # 1st -and is in column mode, thus flips the entire array, whereas the + # 1st -and is in column mode, thus flips the entire array, whereas the # 2nd one is just a condition modifier { where => [ @@ -372,8 +380,6 @@ my @nest_tests = ( }, ); -plan tests => @and_or_tests*4 + @numbered_mods*4 + @nest_tests*2; - for my $case (@and_or_tests) { TODO: { local $TODO = $case->{todo} if $case->{todo}; @@ -384,9 +390,10 @@ for my $case (@and_or_tests) { local $SIG{__WARN__} = sub { push @w, @_ }; my $sql = SQL::Abstract->new ($case->{args} || {}); - my $where_copy = Clone::clone ($case->{where}); - lives_ok (sub { + my $where_copy = dclone($case->{where}); + + lives_ok (sub { my ($stmt, @bind) = $sql->where($case->{where}); is_same_sql_bind( $stmt, @@ -461,3 +468,4 @@ for my $case (@numbered_mods) { } } +done_testing;