X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FSQLite.pm;h=28cadaac3fa9adf83703b5d87b2d969426b4e683;hb=f0c2d11fdca96cbd78a572dba40d33a229ee0b9e;hp=9bd51a41ab371c9cf11e517a6340a2a8437e8443;hpb=49f7b6c7e263293f06a9b308e02e9a26bf94cc20;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI/SQLite.pm b/lib/DBIx/Class/Storage/DBI/SQLite.pm index 9bd51a4..28cadaa 100644 --- a/lib/DBIx/Class/Storage/DBI/SQLite.pm +++ b/lib/DBIx/Class/Storage/DBI/SQLite.pm @@ -6,7 +6,8 @@ use warnings; use base qw/DBIx::Class::Storage::DBI/; use mro 'c3'; -use DBIx::Class::_Util 'modver_gt_or_eq'; +use SQL::Abstract 'is_plain_value'; +use DBIx::Class::_Util qw(modver_gt_or_eq sigwarn_silencer dbic_internal_try); use DBIx::Class::Carp; use Try::Tiny; use namespace::clean; @@ -60,14 +61,9 @@ stringifiable object. Even if you upgrade DBIx::Class (which works around the bug starting from version 0.08210) you may still have corrupted/incorrect data in your database. -DBIx::Class will currently detect when this condition (more than one -stringifiable object in one CRUD call) is encountered and will issue a warning -pointing to this section. This warning will be removed 2 years from now, -around April 2015, You can disable it after you've audited your data by -setting the C environment variable. Note - the warning -is emitted only once per callsite per process and only when the condition in -question is encountered. Thus it is very unlikely that your logsystem will be -flooded as a result of this. +DBIx::Class warned about this condition for several years, hoping to give +anyone affected sufficient notice of the potential issues. The warning was +removed in 2015/v0.082820. =back @@ -126,11 +122,18 @@ sub _exec_svp_release { sub _exec_svp_rollback { my ($self, $name) = @_; - # For some reason this statement changes the value of $dbh->{AutoCommit}, so - # we localize it here to preserve the original value. - local $self->_dbh->{AutoCommit} = $self->_dbh->{AutoCommit}; + $self->_dbh->do("ROLLBACK TO SAVEPOINT $name"); - $self->_dbh->do("ROLLBACK TRANSACTION TO SAVEPOINT $name"); + # resync state for older DBD::SQLite (RT#67843) + # https://github.com/DBD-SQLite/DBD-SQLite/commit/9b3cdbf + if ( + ! modver_gt_or_eq('DBD::SQLite', '1.33') + and + $self->_dbh->FETCH('AutoCommit') + ) { + $self->_dbh->STORE('AutoCommit', 0); + $self->_dbh->STORE('BegunWork', 1); + } } sub _ping { @@ -160,26 +163,29 @@ sub _ping { unless ($DBD::SQLite::__DBIC_TXN_SYNC_SANE__) { # since we do not have access to sqlite3_get_autocommit(), do a trick # to attempt to *safely* determine what state are we *actually* in. - # FIXME - # also using T::T here leads to bizarre leaks - will figure it out later - my $really_not_in_txn = do { - local $@; + + my $really_not_in_txn; + + # not assigning RV directly to env above, because this causes a bizarre + # leak of the catch{} cref on older perls... wtf + dbic_internal_try { # older versions of DBD::SQLite do not properly detect multiline BEGIN/COMMIT # statements to adjust their {AutoCommit} state. Hence use such a statement # pair here as well, in order to escape from poking {AutoCommit} needlessly # https://rt.cpan.org/Public/Bug/Display.html?id=80087 - eval { - # will fail instantly if already in a txn - $dbh->do("-- multiline\nBEGIN"); - $dbh->do("-- multiline\nCOMMIT"); - 1; - } or do { - ($@ =~ /transaction within a transaction/) - ? 0 - : undef - ; - }; + # + # will fail instantly if already in a txn + $dbh->do("-- multiline\nBEGIN"); + $dbh->do("-- multiline\nCOMMIT"); + + $really_not_in_txn = 1; + } + catch { + $really_not_in_txn = ( $_[0] =~ qr/transaction within a transaction/ + ? 0 + : undef + ); }; # if we were unable to determine this - we may very well be dead @@ -204,7 +210,7 @@ sub _ping { } # do the actual test and return on no failure - ( $ping_fail ||= ! try { $dbh->do('SELECT * FROM sqlite_master LIMIT 1'); 1 } ) + ( $ping_fail ||= ! dbic_internal_try { $dbh->do('SELECT * FROM sqlite_master LIMIT 1'); 1 } ) or return 1; # the actual RV of _ping() # ping failed (or so it seems) - need to do some cleanup @@ -213,8 +219,7 @@ sub _ping { # keeps the actual file handle open. We don't really want this to happen, # so force-close the handle via DBI itself # - local $@; # so that we do not clobber the real error as set above - eval { $dbh->disconnect }; # if it fails - it fails + dbic_internal_try { $dbh->disconnect }; # if it fails - it fails undef; # the actual RV of _ping() } @@ -232,20 +237,59 @@ sub deployment_statements { $sqltargs->{producer_args}{sqlite_version} = $dver; } - $sqltargs->{quote_identifiers} - = !!$self->sql_maker->_quote_chars - if ! exists $sqltargs->{quote_identifiers}; - $self->next::method($schema, $type, $version, $dir, $sqltargs, @rest); } sub bind_attribute_by_data_type { - $_[1] =~ /^ (?: int(?:eger)? | (?:tiny|small|medium)int ) $/ix - ? DBI::SQL_INTEGER() + + # According to http://www.sqlite.org/datatype3.html#storageclasses + # all numeric types are dynamically allocated up to 8 bytes per + # individual value + # Thus it should be safe and non-wasteful to bind everything as + # SQL_BIGINT and have SQLite deal with storage/comparisons however + # it deems correct + $_[1] =~ /^ (?: int(?:[1248]|eger)? | (?:tiny|small|medium|big)int ) $/ix + ? DBI::SQL_BIGINT() : undef ; } +# FIXME - what the flying fuck... work around RT#76395 +# DBD::SQLite warns on binding >32 bit values with 32 bit IVs +sub _dbh_execute { + if ( + ( + DBIx::Class::_ENV_::IV_SIZE < 8 + or + DBIx::Class::_ENV_::OS_NAME eq 'MSWin32' + ) + and + ! defined $DBD::SQLite::__DBIC_CHECK_dbd_mishandles_bound_BIGINT + ) { + $DBD::SQLite::__DBIC_CHECK_dbd_mishandles_bound_BIGINT = ( + modver_gt_or_eq('DBD::SQLite', '1.37') + ) ? 1 : 0; + } + + local $SIG{__WARN__} = sigwarn_silencer( qr/ + \Qdatatype mismatch: bind\E \s (?: + param \s+ \( \d+ \) \s+ [-+]? \d+ (?: \. 0*)? \Q as integer\E + | + \d+ \s type \s @{[ DBI::SQL_BIGINT() ]} \s as \s [-+]? \d+ (?: \. 0*)? + ) + /x ) if ( + ( + DBIx::Class::_ENV_::IV_SIZE < 8 + or + DBIx::Class::_ENV_::OS_NAME eq 'MSWin32' + ) + and + $DBD::SQLite::__DBIC_CHECK_dbd_mishandles_bound_BIGINT + ); + + shift->next::method(@_); +} + # DBD::SQLite (at least up to version 1.31 has a bug where it will # non-fatally numify a string value bound as an integer, resulting # in insertions of '0' into supposed-to-be-numeric fields @@ -260,39 +304,54 @@ sub _dbi_attrs_for_bind { my $bindattrs = $self->next::method($ident, $bind); - # an attempt to detect former effects of RT#79576, bug itself present between - # 0.08191 and 0.08209 inclusive (fixed in 0.08210 and higher) - my $stringifiable = 0; + if (! defined $DBD::SQLite::__DBIC_CHECK_dbd_can_bind_bigint_values) { + $DBD::SQLite::__DBIC_CHECK_dbd_can_bind_bigint_values + = modver_gt_or_eq('DBD::SQLite', '1.37') ? 1 : 0; + } for my $i (0.. $#$bindattrs) { - - $stringifiable++ if ( length ref $bind->[$i][1] and overload::Method($bind->[$i][1], '""') ); - if ( defined $bindattrs->[$i] and defined $bind->[$i][1] and - $bindattrs->[$i] eq DBI::SQL_INTEGER() - and - $bind->[$i][1] !~ /^ [\+\-]? [0-9]+ (?: \. 0* )? $/x + grep { $bindattrs->[$i] eq $_ } ( + DBI::SQL_INTEGER(), DBI::SQL_TINYINT(), DBI::SQL_SMALLINT(), DBI::SQL_BIGINT() + ) ) { - carp_unique( sprintf ( - "Non-integer value supplied for column '%s' despite the integer datatype", - $bind->[$i][0]{dbic_colname} || "# $i" - ) ); - undef $bindattrs->[$i]; + if ( $bind->[$i][1] !~ /^ [\+\-]? [0-9]+ (?: \. 0* )? $/x ) { + carp_unique( sprintf ( + "Non-integer value supplied for column '%s' despite the integer datatype", + $bind->[$i][0]{dbic_colname} || "# $i" + ) ); + undef $bindattrs->[$i]; + } + elsif ( + ! $DBD::SQLite::__DBIC_CHECK_dbd_can_bind_bigint_values + ) { + # 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 + if ($bind->[$i][1] > 0x7fff_ffff or $bind->[$i][1] < -0x8000_0000) { + carp_unique( sprintf ( + "An integer value occupying more than 32 bits was supplied for column '%s' " + . 'which your version of DBD::SQLite (%s) can not bind properly so DBIC ' + . 'will treat it as a string instead, consider upgrading to at least ' + . 'DBD::SQLite version 1.37', + $bind->[$i][0]{dbic_colname} || "# $i", + DBD::SQLite->VERSION, + ) ); + undef $bindattrs->[$i]; + } + else { + $bindattrs->[$i] = DBI::SQL_INTEGER() + } + } } } - carp_unique( - 'POSSIBLE *PAST* DATA CORRUPTION detected - see ' - . 'DBIx::Class::Storage::DBI::SQLite/RT79576 or ' - . 'http://v.gd/DBIC_SQLite_RT79576 for further details or set ' - . '$ENV{DBIC_RT79576_NOWARN} to disable this warning. Trigger ' - . 'condition encountered' - ) if (!$ENV{DBIC_RT79576_NOWARN} and $stringifiable > 1); - return $bindattrs; } @@ -321,14 +380,17 @@ sub connect_call_use_foreign_keys { ); } -1; +=head1 FURTHER QUESTIONS? -=head1 AUTHOR AND CONTRIBUTORS +Check the list of L. -See L and L in DBIx::Class +=head1 COPYRIGHT AND LICENSE -=head1 LICENSE - -You may distribute this code under the same terms as Perl itself. +This module is free software L +by the L. You can +redistribute it and/or modify it under the same terms as the +L. =cut + +1;