[Bast-commits] r6396 - in DBIx-Class/0.08/trunk: lib/DBIx/Class
t/search
ribasushi at dev.catalyst.perl.org
ribasushi at dev.catalyst.perl.org
Sun May 24 09:42:01 GMT 2009
Author: ribasushi
Date: 2009-05-24 09:42:01 +0000 (Sun, 24 May 2009)
New Revision: 6396
Modified:
DBIx-Class/0.08/trunk/lib/DBIx/Class/SQLAHacks.pm
DBIx-Class/0.08/trunk/t/search/subquery.t
Log:
Make sure we do not clobber search attributes when using subqueries
Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/SQLAHacks.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/SQLAHacks.pm 2009-05-24 08:47:03 UTC (rev 6395)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/SQLAHacks.pm 2009-05-24 09:42:01 UTC (rev 6396)
@@ -340,8 +340,11 @@
sub _fold_sqlbind {
my ($self, $sqlbind) = @_;
- my $sql = shift @$$sqlbind;
- push @{$self->{from_bind}}, @$$sqlbind;
+
+ my @sqlbind = @$$sqlbind; # copy
+ my $sql = shift @sqlbind;
+ push @{$self->{from_bind}}, @sqlbind;
+
return $sql;
}
Modified: DBIx-Class/0.08/trunk/t/search/subquery.t
===================================================================
--- DBIx-Class/0.08/trunk/t/search/subquery.t 2009-05-24 08:47:03 UTC (rev 6395)
+++ DBIx-Class/0.08/trunk/t/search/subquery.t 2009-05-24 09:42:01 UTC (rev 6396)
@@ -1,13 +1,12 @@
#!/usr/bin/perl
use strict;
-use warnings FATAL => 'all';
+use warnings;
use Data::Dumper;
use Test::More;
-plan ( tests => 8 );
use lib qw(t/lib);
use DBICTest;
@@ -17,95 +16,70 @@
my $art_rs = $schema->resultset('Artist');
my $cdrs = $schema->resultset('CD');
-{
- my $cdrs2 = $cdrs->search({
- artist_id => { 'in' => $art_rs->search({}, { rows => 1 })->get_column( 'id' )->as_query },
- });
+my @tests = (
+ {
+ rs => $cdrs,
+ search => {
+ artist_id => { 'in' => $art_rs->search({}, { rows => 1 })->get_column( 'id' )->as_query },
+ },
+ sqlbind => \[
+ "( SELECT me.cdid,me.artist,me.title,me.year,me.genreid,me.single_track FROM cd me WHERE artist_id IN ( SELECT id FROM artist me LIMIT 1 ) )",
+ ],
+ },
- is_same_sql_bind(
- $cdrs2->as_query,
- "( SELECT me.cdid,me.artist,me.title,me.year,me.genreid,me.single_track FROM cd me WHERE artist_id IN ( SELECT id FROM artist me LIMIT 1 ) )",
- [],
- );
-}
-
-{
- my $rs = $art_rs->search(
- {},
- {
+ {
+ rs => $art_rs,
+ attrs => {
'select' => [
$cdrs->search({}, { rows => 1 })->get_column('id')->as_query,
],
},
- );
+ sqlbind => \[
+ "( SELECT (SELECT id FROM cd me LIMIT 1) FROM artist me )",
+ ],
+ },
- is_same_sql_bind(
- $rs->as_query,
- "( SELECT (SELECT id FROM cd me LIMIT 1) FROM artist me )",
- [],
- );
-}
-
-{
- my $rs = $art_rs->search(
- {},
- {
+ {
+ rs => $art_rs,
+ attrs => {
'+select' => [
$cdrs->search({}, { rows => 1 })->get_column('id')->as_query,
],
},
- );
+ sqlbind => \[
+ "( SELECT me.artistid, me.name, me.rank, me.charfield, (SELECT id FROM cd me LIMIT 1) FROM artist me )",
+ ],
+ },
- is_same_sql_bind(
- $rs->as_query,
- "( SELECT me.artistid, me.name, me.rank, me.charfield, (SELECT id FROM cd me LIMIT 1) FROM artist me )",
- [],
- );
-}
-
-# simple from
-{
- my $rs = $cdrs->search(
- {},
- {
+ {
+ rs => $cdrs,
+ attrs => {
alias => 'cd2',
from => [
{ cd2 => $cdrs->search({ id => { '>' => 20 } })->as_query },
],
},
- );
-
- is_same_sql_bind(
- $rs->as_query,
- "( SELECT cd2.cdid, cd2.artist, cd2.title, cd2.year, cd2.genreid, cd2.single_track FROM (SELECT me.cdid,me.artist,me.title,me.year,me.genreid,me.single_track FROM cd me WHERE id > ?) cd2 )",
- [
+ sqlbind => \[
+ "( SELECT cd2.cdid, cd2.artist, cd2.title, cd2.year, cd2.genreid, cd2.single_track FROM (SELECT me.cdid,me.artist,me.title,me.year,me.genreid,me.single_track FROM cd me WHERE id > ?) cd2 )",
[ 'id', 20 ]
],
- );
-}
+ },
-# nested from
-{
- my $art_rs2 = $schema->resultset('Artist')->search({},
{
- from => [ { 'me' => 'artist' },
- [ { 'cds' => $cdrs->search({},{ 'select' => [\'me.artist as cds_artist' ]})->as_query },
- { 'me.artistid' => 'cds_artist' } ] ]
- });
+ rs => $art_rs,
+ attrs => {
+ from => [ { 'me' => 'artist' },
+ [ { 'cds' => $cdrs->search({},{ 'select' => [\'me.artist as cds_artist' ]})->as_query },
+ { 'me.artistid' => 'cds_artist' } ] ]
+ },
+ sqlbind => \[
+ "( SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me JOIN (SELECT me.artist as cds_artist FROM cd me) cds ON me.artistid = cds_artist )"
+ ],
+ },
- is_same_sql_bind(
- $art_rs2->as_query,
- "( SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me JOIN (SELECT me.artist as cds_artist FROM cd me) cds ON me.artistid = cds_artist )", []
- );
-
-
-}
-
-# nested subquery in from
-{
- my $rs = $cdrs->search(
- {},
- {
+ {
+ rs => $cdrs,
+ attrs => {
alias => 'cd2',
from => [
{ cd2 => $cdrs->search(
@@ -118,61 +92,62 @@
}, )->as_query },
],
},
- );
-
- is_same_sql_bind(
- $rs->as_query,
- "( SELECT cd2.cdid, cd2.artist, cd2.title, cd2.year, cd2.genreid, cd2.single_track
- FROM
- (SELECT cd3.cdid,cd3.artist,cd3.title,cd3.year,cd3.genreid,cd3.single_track
- FROM
- (SELECT me.cdid,me.artist,me.title,me.year,me.genreid,me.single_track
- FROM cd me WHERE id < ?) cd3
- WHERE id > ?) cd2
- )",
- [
- [ 'id', 40 ],
+ sqlbind => \[
+ "( SELECT cd2.cdid, cd2.artist, cd2.title, cd2.year, cd2.genreid, cd2.single_track
+ FROM
+ (SELECT cd3.cdid,cd3.artist,cd3.title,cd3.year,cd3.genreid,cd3.single_track
+ FROM
+ (SELECT me.cdid,me.artist,me.title,me.year,me.genreid,me.single_track
+ FROM cd me WHERE id < ?) cd3
+ WHERE id > ?) cd2
+ )",
+ [ 'id', 40 ],
[ 'id', 20 ]
],
- );
+ },
-}
-
-{
- my $rs = $cdrs->search({
- year => {
- '=' => $cdrs->search(
- { artistid => { '=' => \'me.artistid' } },
- { alias => 'inner' }
- )->get_column('year')->max_rs->as_query,
+ {
+ rs => $cdrs,
+ search => {
+ year => {
+ '=' => $cdrs->search(
+ { artistid => { '=' => \'me.artistid' } },
+ { alias => 'inner' }
+ )->get_column('year')->max_rs->as_query,
+ },
},
- });
+ sqlbind => \[
+ "( SELECT me.cdid, me.artist, me.title, me.year, me.genreid, me.single_track FROM cd me WHERE year = (SELECT MAX(inner.year) FROM cd inner WHERE artistid = me.artistid) )",
+ ],
+ },
- is_same_sql_bind(
- $rs->as_query,
- "( SELECT me.cdid, me.artist, me.title, me.year, me.genreid, me.single_track FROM cd me WHERE year = (SELECT MAX(inner.year) FROM cd inner WHERE artistid = me.artistid) )",
- [],
- );
-}
-
-{
- my $rs = $cdrs->search(
- {},
- {
+ {
+ rs => $cdrs,
+ attrs => {
alias => 'cd2',
from => [
{ cd2 => $cdrs->search({ title => 'Thriller' })->as_query },
],
},
- );
-
- is_same_sql_bind(
- $rs->as_query,
- "(SELECT cd2.cdid, cd2.artist, cd2.title, cd2.year, cd2.genreid, cd2.single_track FROM (SELECT me.cdid,me.artist,me.title,me.year,me.genreid,me.single_track FROM cd me WHERE title = ?) cd2)",
- [
+ sqlbind => \[
+ "(SELECT cd2.cdid, cd2.artist, cd2.title, cd2.year, cd2.genreid, cd2.single_track FROM (SELECT me.cdid,me.artist,me.title,me.year,me.genreid,me.single_track FROM cd me WHERE title = ?) cd2)",
[ 'title',
'Thriller'
]
],
- );
+ },
+);
+
+
+plan tests => @tests * 2;
+
+for my $i (0 .. $#tests) {
+ my $t = $tests[$i];
+ for my $p (1, 2) { # repeat everything twice, make sure we do not clobber search arguments
+ is_same_sql_bind (
+ $t->{rs}->search ($t->{search}, $t->{attrs})->as_query,
+ $t->{sqlbind},
+ sprintf 'Testcase %d, pass %d', $i+1, $p,
+ );
+ }
}
More information about the Bast-commits
mailing list