mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 13:10:33 +00:00
52769d5c17
Our version of SQLite causes the tests to fail, so I'm hereby adding a patch from dbsrgits/dbix-class@ed5550d36 with the hunk for the Changes file dropped. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
diff --git a/t/multi_create/standard.t b/t/multi_create/standard.t
|
|
index 5a02947..6c1efd8 100644
|
|
--- a/t/multi_create/standard.t
|
|
+++ b/t/multi_create/standard.t
|
|
@@ -444,7 +444,11 @@ throws_ok ( sub {
|
|
#$t->cd($t->new_related('cd', { artist => undef } ) );
|
|
#$t->{_rel_in_storage} = 0;
|
|
$t->insert;
|
|
-}, qr/cd.artist may not be NULL/, "Exception propogated properly");
|
|
+}, qr/DBI Exception.+(?x:
|
|
+ \QNOT NULL constraint failed: cd.artist\E
|
|
+ |
|
|
+ \Qcd.artist may not be NULL\E
|
|
+)/s, "Exception propogated properly");
|
|
|
|
lives_ok ( sub {
|
|
$schema->resultset('CD')->create ({
|
|
diff --git a/t/relationship/update_or_create_multi.t b/t/relationship/update_or_create_multi.t
|
|
index 8710048..c7cce7a 100644
|
|
--- a/t/relationship/update_or_create_multi.t
|
|
+++ b/t/relationship/update_or_create_multi.t
|
|
@@ -69,7 +69,12 @@ throws_ok {
|
|
year => 2020,
|
|
title => 'the best thing since sliced bread',
|
|
})
|
|
-} qr/\Qcd.artist may not be NULL/, 'ambiguous find + create failed';
|
|
+} qr/DBI Exception.+(?x:
|
|
+ \QNOT NULL constraint failed: cd.artist\E
|
|
+ |
|
|
+ \Qcd.artist may not be NULL\E
|
|
+)/s, 'ambiguous find + create failed'
|
|
+;
|
|
|
|
# expect a create, after a failed search using *only* the
|
|
# *current* relationship and the unique column constraints
|
|
diff --git a/t/storage/error.t b/t/storage/error.t
|
|
index d5980eb..61d6782 100644
|
|
--- a/t/storage/error.t
|
|
+++ b/t/storage/error.t
|
|
@@ -15,7 +15,11 @@ warnings_are ( sub {
|
|
sub {
|
|
$schema->resultset('CD')->create({ title => 'vacation in antarctica' })
|
|
},
|
|
- qr/DBI Exception.+cd\.artist.+NULL/s
|
|
+ qr/DBI Exception.+(?x:
|
|
+ \QNOT NULL constraint failed: cd.artist\E
|
|
+ |
|
|
+ \Qcd.artist may not be NULL\E
|
|
+ )/s
|
|
); # as opposed to some other error
|
|
}, [], 'No warnings besides exception' );
|
|
|