X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F80unique.t;h=b38022504c49faf06501d0ca38d8bc766ac62d7f;hb=698313005dbb1ea5f0b19ce6cd7ea45ac01f16ef;hp=dfd781944938f77d151754e2219188e0c814799f;hpb=034d0be414a18cf3730c1e6e260acf6e70df476c;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/80unique.t b/t/80unique.t
index dfd7819..b380225 100644
--- a/t/80unique.t
+++ b/t/80unique.t
@@ -3,10 +3,9 @@ use warnings;
 
 use Test::More;
 use Test::Exception;
+use Test::Warn;
 use lib qw(t/lib);
 use DBICTest;
-use DBIC::SqlMakerTest;
-use DBIC::DebugObj;
 
 my $schema = DBICTest->init_schema();
 
@@ -132,6 +131,12 @@ is($cd8->get_column('artist'), $cd1->get_column('artist'), 'artist is correct');
 is($cd8->title, $cd1->title, 'title is correct');
 is($cd8->year, $cd1->year, 'year is correct');
 
+# Add an extra row to potentially confuse the query
+$schema->resultset('CD')->create ({
+  artist => 2,
+  title => $title,
+  year => 2022,
+});
 my $cd9 = $artist->cds->update_or_create(
   {
     cdid   => $cd1->cdid,
@@ -219,23 +224,14 @@ is($row->baz, 3, 'baz is correct');
 
 # make sure the ident condition is assembled sanely
 {
-  my $artist = $schema->resultset('Artist')->next;
-
-  my ($sql, @bind);
-  $schema->storage->debugobj(DBIC::DebugObj->new(\$sql, \@bind)),
-  $schema->storage->debug(1);
-
-  $artist->discard_changes;
-
-  is_same_sql_bind (
-    $sql,
-    \@bind,
-    'SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE me.artistid = ?',
-    [qw/'1'/],
-  );
-
-  $schema->storage->debug(0);
-  $schema->storage->debugobj(undef);
+  my $artist = $schema->resultset('Artist')->find(1);
+
+  $schema->is_executed_sql_bind( sub { $artist->discard_changes }, [
+    [
+      'SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE me.artistid = ?',
+      [ { dbic_colname => "me.artistid", sqlt_datatype => "integer" } => 1 ],
+    ]
+  ], 'Expected query on discard_changes');
 }
 
 {
@@ -260,7 +256,22 @@ MOD
   } qr/\Qadd_unique_constraint() does not accept multiple constraints, use add_unique_constraints() instead\E/,
     'add_unique_constraint throws when more than one constraint specified';
 }
+# make sure NULL is not considered condition-deterministic
+my $art_rs = $schema->resultset('Artist')->search({}, { order_by => 'artistid' });
+$art_rs->create ({ artistid => $_ + 640, name => "Outranked $_" }) for (1..2);
+warnings_are {
+  is(
+    $art_rs->find ({ artistid => 642, rank => 13, charfield => undef })->name,
+    'Outranked 2',
+    'Correct artist retrieved with find'
+  );
 
+  is (
+    $art_rs->search({ charfield => undef })->find ({ artistid => 642, rank => 13 })->name,
+    'Outranked 2',
+    'Correct artist retrieved with find'
+  );
+} [], 'no warnings';
 
 done_testing;