use strict;
-use warnings;
+use warnings;
use Test::More;
use lib qw(t/lib);
-use DBICTest;
-use Data::Dumper;
-use DBIC::SqlMakerTest;
+use DBICTest ':DiffSQL';
my $schema = DBICTest->init_schema();
-my $orig_debug = $schema->storage->debug;
-
-use IO::File;
-
-BEGIN {
- eval "use DBD::SQLite";
- plan $@
- ? ( skip_all => 'needs DBD::SQLite for testing' )
- : ( tests => 33 );
-}
-
-# figure out if we've got a version of sqlite that is older than 3.2.6, in
-# which case COUNT(DISTINCT()) doesn't work
-my $is_broken_sqlite = 0;
-my ($sqlite_major_ver,$sqlite_minor_ver,$sqlite_patch_ver) =
- split /\./, $schema->storage->dbh->get_info(18);
-if( $schema->storage->dbh->get_info(17) eq 'SQLite' &&
- ( ($sqlite_major_ver < 3) ||
- ($sqlite_major_ver == 3 && $sqlite_minor_ver < 2) ||
- ($sqlite_major_ver == 3 && $sqlite_minor_ver == 2 && $sqlite_patch_ver < 6) ) ) {
- $is_broken_sqlite = 1;
-}
-
# test the abstract join => SQL generator
-my $sa = new DBIx::Class::SQLAHacks;
+my $sa = DBIx::Class::SQLMaker->new;
my @j = (
{ child => 'person' },
. 'child.father_id ) JOIN person mother ON ( mother.person_id '
. '= child.mother_id )'
;
-is_same_sql_bind(
- $sa->_recurse_from(@j), [],
- $match, [],
+is_same_sql(
+ $sa->_recurse_from(@j),
+ $match,
'join 1 ok'
);
. ' father.person_id = child.father_id )) ON ( mother.person_id = '
. 'child.mother_id )'
;
-is_same_sql_bind(
- $sa->_recurse_from(@j2), [],
- $match, [],
+is_same_sql(
+ $sa->_recurse_from(@j2),
+ $match,
'join 2 ok'
);
. '= child.mother_id )'
;
-is_same_sql_bind(
- $sa->_recurse_from(@j3), [],
- $match, [],
+is_same_sql(
+ $sa->_recurse_from(@j3),
+ $match,
'join 3 (inner join) ok'
);
. ' father.person_id = child.father_id )) ON ( mother.person_id = '
. 'child.mother_id )'
;
-is_same_sql_bind(
- $sa->_recurse_from(@j4), [],
- $match, [],
+is_same_sql(
+ $sa->_recurse_from(@j4),
+ $match,
'join 4 (nested joins + join types) ok'
);
. 'child.father_id ) JOIN person mother ON ( mother.person_id '
. '= child.mother_id )'
;
-is_same_sql_bind(
- $sa->_recurse_from(@j5), [],
- $match, [],
+is_same_sql(
+ $sa->_recurse_from(@j5),
+ $match,
'join 5 (SCALAR reference for ON statement) ok'
);
-my @j6 = (
- { child => 'person' },
- [ { father => 'person' }, { 'father.person_id' => { '!=', '42' } }, ],
- [ { mother => 'person' }, { 'mother.person_id' => 'child.mother_id' } ],
-);
-$match = qr/HASH reference arguments are not supported in JOINS/;
-eval { $sa->_recurse_from(@j6) };
-like( $@, $match, 'join 6 (HASH reference for ON statement dies) ok' );
-
my $rs = $schema->resultset("CD")->search(
{ 'year' => 2001, 'artist.name' => 'Caterwauler McCrae' },
{ from => [ { 'me' => 'cd' },
[ 4, 7 ],
[ 4, 8 ],
]);
-
- sub cd_count {
- return $schema->resultset("CD")->count;
- }
- sub tk_count {
- return $schema->resultset("TwoKeys")->count;
- }
-
- is(cd_count(), 8, '8 rows in table cd');
- is(tk_count(), 7, '7 rows in table twokeys');
-
- sub artist1 {
- return $schema->resultset("CD")->search(
- { 'artist.name' => 'Caterwauler McCrae' },
- { join => [qw/artist/]}
- );
- }
- sub artist2 {
- return $schema->resultset("CD")->search(
- { 'artist.name' => 'Random Boy Band' },
- { join => [qw/artist/]}
- );
- }
-
- is( artist1()->count, 3, '3 Caterwauler McCrae CDs' );
- ok( artist1()->delete, 'Successfully deleted 3 CDs' );
- is( artist1()->count, 0, '0 Caterwauler McCrae CDs' );
- is( artist2()->count, 2, '3 Random Boy Band CDs' );
- ok( artist2()->update( { 'artist' => 1 } ) );
- is( artist2()->count, 0, '0 Random Boy Band CDs' );
- is( artist1()->count, 2, '2 Caterwauler McCrae CDs' );
+
+ my $cd_count = sub { $schema->resultset("CD")->count };
+ my $tk_count = sub { $schema->resultset("TwoKeys")->count };
+
+ is($cd_count->(), 8, '8 rows in table cd');
+ is($tk_count->(), 7, '7 rows in table twokeys');
+
+ my $artist1_rs = $schema->resultset("CD")->search(
+ { 'artist.name' => 'Caterwauler McCrae' },
+ { join => [qw/artist/]}
+ );
+
+ my $artist2_rs = $schema->resultset("CD")->search(
+ { 'artist.name' => 'Random Boy Band' },
+ { join => [qw/artist/]}
+ );
+
+ is( $artist1_rs->count, 3, '3 Caterwauler McCrae CDs' );
+ ok( $artist1_rs->delete, 'Successfully deleted 3 CDs' );
+ is( $artist1_rs->count, 0, '0 Caterwauler McCrae CDs' );
+ is( $artist2_rs->count, 2, '3 Random Boy Band CDs' );
+ ok( $artist2_rs->update( { 'artist' => 1 } ) );
+ is( $artist2_rs->count, 0, '0 Random Boy Band CDs' );
+ is( $artist1_rs->count, 2, '2 Caterwauler McCrae CDs' );
# test update on multi-column-pk
- sub tk1 {
- return $schema->resultset("TwoKeys")->search(
- {
- 'artist.name' => { like => '%Boy Band' },
- 'cd.title' => 'Greatest Hits',
- },
- { join => [qw/artist cd/] }
- );
- }
- sub tk2 {
- return $schema->resultset("TwoKeys")->search(
- { 'artist.name' => 'Caterwauler McCrae' },
- { join => [qw/artist/]}
- );
- }
- is( tk2()->count, 2, 'TwoKeys count == 2' );
- is( tk1()->count, 2, 'TwoKeys count == 2' );
- ok( tk1()->update( { artist => 1 } ) );
- is( tk1()->count, 0, 'TwoKeys count == 0' );
- is( tk2()->count, 4, '2 Caterwauler McCrae CDs' );
- ok( tk2()->delete, 'Successfully deleted 4 CDs' );
- is(cd_count(), 5, '5 rows in table cd');
- is(tk_count(), 3, '3 rows in table twokeys');
+ my $tk1_rs = $schema->resultset("TwoKeys")->search(
+ {
+ 'artist.name' => { like => '%Boy Band' },
+ 'cd.title' => 'Greatest Hits',
+ },
+ { join => [qw/artist cd/] }
+ );
+
+ my $tk2_rs = $schema->resultset("TwoKeys")->search(
+ { 'artist.name' => 'Caterwauler McCrae' },
+ { join => [qw/artist/]}
+ );
+
+ is( $tk2_rs->count, 2, 'TwoKeys count == 2' );
+ is( $tk1_rs->count, 2, 'TwoKeys count == 2' );
+ ok( $tk1_rs->update( { artist => 1 } ) );
+ is( $tk1_rs->count, 0, 'TwoKeys count == 0' );
+ is( $tk2_rs->count, 4, '2 Caterwauler McCrae CDs' );
+ ok( $tk2_rs->delete, 'Successfully deleted 4 CDs' );
+ is($cd_count->(), 5, '5 rows in table cd');
+ is($tk_count->(), 3, '3 rows in table twokeys');
}
+
+done_testing;