X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F752sqlite.t;h=888284671eb5222c4bb6730c046bdc5d1b33317d;hb=04ab4eb1;hp=1895a9f69bfac1646ee2157d1674ecf9591ec79e;hpb=9fd5c112aed0aa0734266ccbc2b66a3e37d62ce2;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/752sqlite.t b/t/752sqlite.t
index 1895a9f..8882846 100644
--- a/t/752sqlite.t
+++ b/t/752sqlite.t
@@ -5,10 +5,10 @@ use Test::More;
 use Test::Exception;
 use Test::Warn;
 use Time::HiRes 'time';
-use Config;
 
 use lib qw(t/lib);
 use DBICTest;
+use DBIx::Class::_Util qw(sigwarn_silencer modver_gt_or_eq);
 
 # savepoints test
 {
@@ -48,6 +48,14 @@ use DBICTest;
 #
 # As per https://metacpan.org/source/ADAMK/DBD-SQLite-1.37/lib/DBD/SQLite.pm#L921
 # SQLite does *not* try to synchronize
+#
+# However DBD::SQLite 1.38_02 seems to fix this, with an accompanying test:
+# https://metacpan.org/source/ADAMK/DBD-SQLite-1.38_02/t/54_literal_txn.t
+
+my $lit_txn_todo = modver_gt_or_eq('DBD::SQLite', '1.38_02')
+  ? undef
+  : "DBD::SQLite before 1.38_02 is retarded wrt detecting literal BEGIN/COMMIT statements"
+;
 
 for my $prefix_comment (qw/Begin_only Commit_only Begin_and_Commit/) {
   note "Testing with comment prefixes on $prefix_comment";
@@ -55,8 +63,8 @@ for my $prefix_comment (qw/Begin_only Commit_only Begin_and_Commit/) {
   # FIXME warning won't help us for the time being
   # perhaps when (if ever) DBD::SQLite gets fixed,
   # we can do something extra here
-  local $SIG{__WARN__} = sub { warn @_ if $_[0] !~ /Internal transaction state .+? does not seem to match/ }
-    unless $ENV{TEST_VERBOSE};
+  local $SIG{__WARN__} = sigwarn_silencer( qr/Internal transaction state .+? does not seem to match/ )
+    if ( $lit_txn_todo && !$ENV{TEST_VERBOSE} );
 
   my ($c_begin, $c_commit) = map { $prefix_comment =~ $_ ? 1 : 0 } (qr/Begin/, qr/Commit/);
 
@@ -86,7 +94,7 @@ DDL
   );
   ok ($schema->storage->connected, 'Still connected');
   {
-    local $TODO = 'SQLite is retarded wrt detecting BEGIN' if $c_begin;
+    local $TODO = $lit_txn_todo if $c_begin;
     ok (! $schema->storage->_dbh->{AutoCommit}, "DBD aware of txn begin with comments on $prefix_comment");
   }
 
@@ -96,7 +104,7 @@ DDL
   );
   ok ($schema->storage->connected, 'Still connected');
   {
-    local $TODO = 'SQLite is retarded wrt detecting COMMIT' if $c_commit and ! $c_begin;
+    local $TODO = $lit_txn_todo if $c_commit and ! $c_begin;
     ok ($schema->storage->_dbh->{AutoCommit}, "DBD aware txn ended with comments on $prefix_comment");
   }
 
@@ -104,7 +112,7 @@ DDL
 
   {
     # this never worked in the 1st place
-    local $TODO = 'SQLite is retarded wrt detecting COMMIT' if ! $c_begin and $c_commit;
+    local $TODO = $lit_txn_todo if ! $c_begin and $c_commit;
 
     # odd argument passing, because such nested crefs leak on 5.8
     lives_ok {
@@ -121,7 +129,7 @@ my $schema = DBICTest->init_schema();
 # make sure the side-effects of RT#67581 do not result in data loss
 my $row;
 warnings_exist { $row = $schema->resultset('Artist')->create ({ name => 'alpha rank', rank => 'abc' }) }
-  [qr/Non-numeric value supplied for column 'rank' despite the numeric datatype/],
+  [qr/Non-integer value supplied for column 'rank' despite the integer datatype/],
   'proper warning on string insertion into an numeric column'
 ;
 $row->discard_changes;
@@ -141,32 +149,81 @@ $schema->storage->dbh_do(sub {
 
 # test upper/lower boundaries for sqlite and some values inbetween
 # range is -(2**63) .. 2**63 - 1
-SKIP: {
-  skip 'This perl does not seem to have 64bit int support - DBI roundtrip of large int will fail with DBD::SQLite < 1.37', 1
-    if ($Config{ivsize} < 8 and ! eval { DBD::SQLite->VERSION(1.37); 1 });
-
-  for my $bi (qw/
-    -9223372036854775808
-    -9223372036854775807
-    -8694837494948124658
-    -6848440844435891639
-    -5664812265578554454
-    -5380388020020483213
-    -2564279463598428141
-    2442753333597784273
-    4790993557925631491
-    6773854980030157393
-    7627910776496326154
-    8297530189347439311
-    9223372036854775806
-    9223372036854775807
-  /) {
+for my $bi ( qw(
+  -9223372036854775808
+  -9223372036854775807
+  -8694837494948124658
+  -6848440844435891639
+  -5664812265578554454
+  -5380388020020483213
+  -2564279463598428141
+  2442753333597784273
+  4790993557925631491
+  6773854980030157393
+  7627910776496326154
+  8297530189347439311
+  9223372036854775806
+  9223372036854775807
+
+  4294967295
+  4294967296
+
+  -4294967296
+  -4294967295
+  -4294967294
+
+  -2147483649
+  -2147483648
+  -2147483647
+  -2147483646
+
+  2147483646
+  2147483647
+),
+  # these values cause exceptions even with all workarounds in place on these
+  # fucked DBD::SQLite versions *regardless* of ivsize >.<
+  ( modver_gt_or_eq('DBD::SQLite', '1.34') and ! modver_gt_or_eq('DBD::SQLite', '1.37') )
+    ? ()
+    : ( '2147483648', '2147483649' )
+) {
+  # unsigned 32 bit ints have a range of −2,147,483,648 to 2,147,483,647
+  # alternatively expressed as the hexadecimal numbers below
+  # the comparison math will come out right regardless of ivsize, since
+  # we are operating within 31 bits
+  # P.S. 31 because one bit is lost for the sign
+  my $v_bits = ($bi > 0x7fff_ffff || $bi < -0x8000_0000) ? 64 : 32;
+
+  my $v_desc = sprintf '%s (%d bit signed int)', $bi, $v_bits;
+
+  my $w;
+  lives_ok {
+    local $SIG{__WARN__} = sigwarn_silencer( qr/datatype mismatch/ );
     $row = $schema->resultset('BigIntArtist')->create({ bigint => $bi });
-    is ($row->bigint, $bi, "value in object correct ($bi)");
+  } "Insering value $bi ($v_desc)" or next;
 
-    $row->discard_changes;
-    is ($row->bigint, $bi, "value in database correct ($bi)");
-  }
+  is ($w, undef, 'No mismatch warning on bigints' );
+
+  # explicitly using eq, to make sure we did not nummify the argument
+  # which can be an issue on 32 bit ivsize
+  cmp_ok ($row->bigint, 'eq', $bi, "value in object correct ($v_desc)");
+
+  $row->discard_changes;
+
+  cmp_ok (
+    $row->bigint,
+
+    # the test will not pass an == if we are running under 32 bit ivsize
+    # use 'eq' on the numified (and possibly "scientificied") returned value
+    DBIx::Class::_ENV_::IV_SIZE < 8 ? 'eq' : '==',
+
+    # in 1.37 DBD::SQLite switched to proper losless representation of bigints
+    # regardless of ivize
+    # before this use 'eq' (from above) on the numified (and possibly
+    # "scientificied") returned value
+    (DBIx::Class::_ENV_::IV_SIZE < 8 and ! modver_gt_or_eq('DBD::SQLite', '1.37')) ? $bi+0 : $bi,
+
+    "value in database correct ($v_desc)"
+  );
 }
 
 done_testing;