From: Ash Berlin Date: Sun, 5 Apr 2009 13:51:03 +0000 (+0000) Subject: Fix test in t/91debug.t for less ambigious SQL bracketing for 0.08013 release X-Git-Tag: v0.08013^0 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fmaint%2F0.0800xx;p=dbsrgits%2FDBIx-Class.git Fix test in t/91debug.t for less ambigious SQL bracketing for 0.08013 release --- diff --git a/Makefile.PL b/Makefile.PL index 4dac67c..f62f333 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,4 +1,4 @@ -use inc::Module::Install 0.67; +use inc::Module::Install 0.81; name 'DBIx-Class'; perl_version '5.006001'; @@ -6,16 +6,16 @@ all_from 'lib/DBIx/Class.pm'; requires 'Data::Page' => 2.00; requires 'Scalar::Util' => 0; -requires 'SQL::Abstract' => 1.24; +requires 'SQL::Abstract' => 1.51; requires 'SQL::Abstract::Limit' => 0.13; requires 'Class::C3' => 0.20; -requires 'Class::C3::Componentised' => 0; +requires 'Class::C3::Componentised' => 1.0004; requires 'Storable' => 0; requires 'Carp::Clan' => 0; requires 'DBI' => 1.40; requires 'Module::Find' => 0; requires 'Class::Inspector' => 0; -requires 'Class::Accessor::Grouped' => 0.08002; +requires 'Class::Accessor::Grouped' => 0.08003; requires 'JSON::Any' => 1.17; requires 'Scope::Guard' => 0.03; requires 'List::Util' => 1.19; diff --git a/t/81transactions.t b/t/81transactions.t index d1ca332..587bcc1 100644 --- a/t/81transactions.t +++ b/t/81transactions.t @@ -241,7 +241,6 @@ undef $schema; # Test txn_scope_guard { - local $TODO = "Work out how this should work"; # reset schema $schema = DBICTest->init_schema(); @@ -276,6 +275,7 @@ undef $schema; # forcing a txn_rollback to happen outer($schema, 0); }; + local $TODO = "Work out how this should work"; is($@, "Not sure what we want here, but something", "Rollback okay"); ok(!$artist_rs->find({name => 'Death Cab for Cutie'}), "Artist not created"); diff --git a/t/91debug.t b/t/91debug.t index 50de1e3..b0933b4 100644 --- a/t/91debug.t +++ b/t/91debug.t @@ -58,7 +58,7 @@ open(STDERR, '>&STDERRCOPY'); my @cds = $schema->resultset('CD')->search( { artist => 1, cdid => { -between => [ 1, 3 ] }, } ); is_same_sql_bind ( $sql, \@bind, - q/SELECT me.cdid, me.artist, me.title, me.year FROM cd me WHERE ( artist = ? AND cdid BETWEEN ? AND ? )/, + q/SELECT me.cdid, me.artist, me.title, me.year FROM cd me WHERE ( artist = ? AND (cdid BETWEEN ? AND ?) )/, [qw/'1' '1' '3'/], 'got correct SQL with all bind parameters' ); diff --git a/t/95sql_maker_quote.t b/t/95sql_maker_quote.t index 80b180f..b70a477 100644 --- a/t/95sql_maker_quote.t +++ b/t/95sql_maker_quote.t @@ -84,13 +84,12 @@ TODO: { is_same_sql_bind( $sql, \@bind, - q/SELECT `me`.`cdid`, `me`.`artist`, `me`.`title`, `me`.`year` FROM `cd` `me` ORDER BY `year DESC`/, [], + q/SELECT `me`.`cdid`, `me`.`artist`, `me`.`title`, `me`.`year` FROM `cd` `me` ORDER BY `year` DESC/, [], 'scalar ORDER BY okay (single value)' ); } TODO: { - local $TODO = "select attr with star needs fixing (mst/nate)"; ($sql, @bind) = $sql_maker->select( [