X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FOracle%2FGeneric.pm;h=2b4ce757bf0c661e254f54e53b679cb70257450f;hb=f8135512c346d8cb6f3dc569f4bb11576e85f97b;hp=961b447986202513d12e88bed6f75ffa1255e92b;hpb=630eee4175ed202f2fdf8965d6299162cf04bf55;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm b/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm index 961b447..2b4ce75 100644 --- a/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm +++ b/lib/DBIx/Class/Storage/DBI/Oracle/Generic.pm @@ -103,9 +103,6 @@ sub deployment_statements { my ($schema, $type, $version, $dir, $sqltargs, @rest) = @_; $sqltargs ||= {}; - my $quote_char = $self->schema->storage->sql_maker->quote_char; - $sqltargs->{quote_table_names} = $quote_char ? 1 : 0; - $sqltargs->{quote_field_names} = $quote_char ? 1 : 0; if ( ! exists $sqltargs->{producer_args}{oracle_version} @@ -203,7 +200,7 @@ sub _dbh_get_autoinc_seq { } else { $self->throw_exception( sprintf ( - "Unable to introspect trigger '%s' for column %s.%s (references multiple sequences). " + "Unable to introspect trigger '%s' for column '%s.%s' (references multiple sequences). " . "You need to specify the correct 'sequence' explicitly in '%s's column_info.", $triggers[0]{name}, $source_name, @@ -225,7 +222,7 @@ sub _dbh_get_autoinc_seq { } else { $self->throw_exception( sprintf ( - "Unable to reliably select a BEFORE INSERT trigger for column %s.%s (possibilities: %s). " + "Unable to reliably select a BEFORE INSERT trigger for column '%s.%s' (possibilities: %s). " . "You need to specify the correct 'sequence' explicitly in '%s's column_info.", $source_name, $col, @@ -246,7 +243,7 @@ sub _dbh_get_autoinc_seq { } $self->throw_exception( sprintf ( - "No suitable BEFORE INSERT triggers found for column %s.%s. " + "No suitable BEFORE INSERT triggers found for column '%s.%s'. " . "You need to specify the correct 'sequence' explicitly in '%s's column_info.", $source_name, $col, @@ -258,8 +255,12 @@ sub _sequence_fetch { my ( $self, $type, $seq ) = @_; # use the maker to leverage quoting settings - my $sql_maker = $self->sql_maker; - my ($id) = $self->_get_dbh->selectrow_array ($sql_maker->select('DUAL', [ ref $seq ? \"$$seq.$type" : "$seq.$type" ] ) ); + my $sth = $self->_dbh->prepare_cached( + $self->sql_maker->select('DUAL', [ ref $seq ? \"$$seq.$type" : "$seq.$type" ] ) + ); + $sth->execute; + my ($id) = $sth->fetchrow_array; + $sth->finish; return $id; } @@ -280,55 +281,53 @@ sub _ping { } sub _dbh_execute { - my ($self, $dbh, $sql, @args) = @_; + #my ($self, $dbh, $sql, $bind, $bind_attrs) = @_; + my ($self, $sql, $bind) = @_[0,2,3]; - my (@res, $tried); - my $want = wantarray; - my $next = $self->next::can; - do { - try { - my $exec = sub { - # Turn off sth caching for multi-part LOBs. See _prep_for_execute above. - local $self->{disable_sth_caching} = 1 - if first { - ($_->[0]{_ora_lob_autosplit_part}||0) - > (__cache_queries_with_max_lob_parts-1) - } @{ $args[0] }; - - $self->$next($dbh, $sql, @args) - }; + # Turn off sth caching for multi-part LOBs. See _prep_for_execute below + local $self->{disable_sth_caching} = 1 if first { + ($_->[0]{_ora_lob_autosplit_part}||0) + > + (__cache_queries_with_max_lob_parts - 1) + } @$bind; - if (!defined $want) { - $exec->(); - } - elsif (! $want) { - $res[0] = $exec->(); - } - else { - @res = $exec->(); - } + my $next = $self->next::can; - $tried++; - } - catch { - if (! $tried and $_ =~ /ORA-01003/) { - # ORA-01003: no statement parsed (someone changed the table somehow, - # invalidating your cursor.) + # if we are already in a txn we can't retry anything + return shift->$next(@_) + if $self->transaction_depth; + + # cheat the blockrunner we are just about to create + # we do want to rerun things regardless of outer state + local $self->{_in_do_block}; + + return DBIx::Class::Storage::BlockRunner->new( + storage => $self, + wrap_txn => 0, + retry_handler => sub { + # ORA-01003: no statement parsed (someone changed the table somehow, + # invalidating your cursor.) + if ( + $_[0]->failed_attempt_count == 1 + and + $_[0]->last_exception =~ /ORA-01003/ + and + my $dbh = $_[0]->storage->_dbh + ) { delete $dbh->{CachedKids}{$sql}; + return 1; } else { - $self->throw_exception($_); + return 0; } - }; - } while (! $tried++); - - return wantarray ? @res : $res[0]; + }, + )->run( $next, @_ ); } -sub _dbh_execute_array { +sub _dbh_execute_for_fetch { #my ($self, $sth, $tuple_status, @extra) = @_; - # DBD::Oracle warns loudly on partial execute_array failures + # DBD::Oracle warns loudly on partial execute_for_fetch failures local $_[1]->{PrintWarn} = 0; shift->next::method(@_); @@ -429,28 +428,35 @@ sub _dbi_attrs_for_bind { $attrs; } -my $dbd_loaded; sub bind_attribute_by_data_type { my ($self, $dt) = @_; - $dbd_loaded ||= do { - require DBD::Oracle; - if ($DBD::Oracle::VERSION eq '1.23') { - $self->throw_exception( - "BLOB/CLOB support in DBD::Oracle == 1.23 is broken, use an earlier or later ". - "version.\n\nSee: https://rt.cpan.org/Public/Bug/Display.html?id=46016\n" - ); + if ($self->_is_lob_type($dt)) { + + # this is a hot-ish codepath, store an escape-flag in the DBD namespace, so that + # things like Class::Unload work (unlikely but possible) + unless ($DBD::Oracle::__DBIC_DBD_VERSION_CHECK_OK__) { + + # no earlier - no later + if ($DBD::Oracle::VERSION eq '1.23') { + $self->throw_exception( + "BLOB/CLOB support in DBD::Oracle == 1.23 is broken, use an earlier or later ". + "version (https://rt.cpan.org/Public/Bug/Display.html?id=46016)" + ); + } + + $DBD::Oracle::__DBIC_DBD_VERSION_CHECK_OK__ = 1; } - 1; - }; - if ($self->_is_lob_type($dt)) { return { ora_type => $self->_is_text_lob_type($dt) ? DBD::Oracle::ORA_CLOB() : DBD::Oracle::ORA_BLOB() }; } + else { + return undef; + } } # Handle blob columns in WHERE. @@ -491,94 +497,106 @@ sub _prep_for_execute { my $self = shift; my ($op) = @_; - my ($sql, $bind) = $self->next::method(@_); + return $self->next::method(@_) + if $op eq 'insert'; - return ($sql, $bind) if $op eq 'insert'; + my ($sql, $bind) = $self->next::method(@_); - my $blob_bind_index; - for (0 .. $#$bind) { - $blob_bind_index->{$_} = 1 if $self->_is_lob_type( + my $lob_bind_indices = { map { + ( $bind->[$_][0]{sqlt_datatype} - ); - } - - return ($sql, $bind) unless $blob_bind_index; + and + $self->_is_lob_type($bind->[$_][0]{sqlt_datatype}) + ) ? ( $_ => 1 ) : () + } ( 0 .. $#$bind ) }; - my (@sql_parts, $new_sql, @new_binds); + return ($sql, $bind) unless %$lob_bind_indices; - if ($op eq 'select' || $op eq 'delete') { - @sql_parts = split /\?/, $sql; - } - elsif ($op eq 'update') { - $self->throw_exception('Update with complex WHERE clauses currently not supported') + my ($final_sql, @final_binds); + if ($op eq 'update') { + $self->throw_exception('Update with complex WHERE clauses involving BLOB columns currently not supported') if $sql =~ /\bWHERE\b .+ \bWHERE\b/xs; - my ($set_part, $where_part) = $sql =~ /^ (.+?) ( \bWHERE\b .+) /xs; + my $where_sql; + ($final_sql, $where_sql) = $sql =~ /^ (.+?) ( \bWHERE\b .+) /xs; + + if (my $set_bind_count = $final_sql =~ y/?//) { + + delete $lob_bind_indices->{$_} for (0 .. ($set_bind_count - 1)); + + # bail if only the update part contains blobs + return ($sql, $bind) unless %$lob_bind_indices; - my $set_bind_count = $set_part =~ y/?//; - @new_binds = splice @$bind, 0, $set_bind_count; + @final_binds = splice @$bind, 0, $set_bind_count; + $lob_bind_indices = { map + { $_ - $set_bind_count => $lob_bind_indices->{$_} } + keys %$lob_bind_indices + }; + } - @sql_parts = split /\?/, $where_part; - $new_sql = $set_part; + # if we got that far - assume the where SQL is all we got + # (the first part is already shoved into $final_sql) + $sql = $where_sql; } - else { + elsif ($op ne 'select' and $op ne 'delete') { $self->throw_exception("Unsupported \$op: $op"); } + my @sql_parts = split /\?/, $sql; + my $col_equality_re = qr/ (?<=\s) ([\w."]+) (\s*=\s*) $/x; for my $b_idx (0 .. $#$bind) { my $bound = $bind->[$b_idx]; - if ($blob_bind_index->{$b_idx}) { - if (my ($col, $eq) = $sql_parts[0] =~ $col_equality_re) { - my $data = $bound->[1]; + if ( + $lob_bind_indices->{$b_idx} + and + my ($col, $eq) = $sql_parts[0] =~ $col_equality_re + ) { + my $data = $bound->[1]; - $data = "$data" if ref $data; + $data = "$data" if ref $data; - my @parts = unpack '(a2000)*', $data; + my @parts = unpack '(a2000)*', $data; - my @sql_frag; + my @sql_frag; - for my $idx (0..$#parts) { - push @sql_frag, sprintf ( - 'UTL_RAW.CAST_TO_VARCHAR2(RAWTOHEX(DBMS_LOB.SUBSTR(%s, 2000, %d))) = ?', - $col, ($idx*2000 + 1), - ); - } + for my $idx (0..$#parts) { + push @sql_frag, sprintf ( + 'UTL_RAW.CAST_TO_VARCHAR2(RAWTOHEX(DBMS_LOB.SUBSTR(%s, 2000, %d))) = ?', + $col, ($idx*2000 + 1), + ); + } - my $sql_frag = '( ' . (join ' AND ', @sql_frag) . ' )'; + my $sql_frag = '( ' . (join ' AND ', @sql_frag) . ' )'; - $sql_parts[0] =~ s/$col_equality_re/$sql_frag/; + $sql_parts[0] =~ s/$col_equality_re/$sql_frag/; - $new_sql .= shift @sql_parts; + $final_sql .= shift @sql_parts; - for my $idx (0..$#parts) { - push @new_binds, [ - { - %{ $bound->[0] }, - _ora_lob_autosplit_part => $idx, - dbd_attrs => undef, - }, - $parts[$idx] - ]; - } - } - else { - $new_sql .= shift(@sql_parts) . '?'; - - push @new_binds, [ + for my $idx (0..$#parts) { + push @final_binds, [ { %{ $bound->[0] }, + _ora_lob_autosplit_part => $idx, dbd_attrs => undef, }, - $bound->[1], + $parts[$idx] ]; } } else { - $new_sql .= shift(@sql_parts) . '?'; - push @new_binds, $bound; + $final_sql .= shift(@sql_parts) . '?'; + push @final_binds, $lob_bind_indices->{$b_idx} + ? [ + { + %{ $bound->[0] }, + dbd_attrs => undef, + }, + $bound->[1], + ] : $bound + ; } } @@ -587,9 +605,9 @@ sub _prep_for_execute { @sql_parts = join ('?', @sql_parts); } - $new_sql .= $sql_parts[0]; + $final_sql .= $sql_parts[0]; - return ($new_sql, \@new_binds); + return ($final_sql, \@final_binds); } # Savepoints stuff. @@ -617,7 +635,7 @@ Unfortunately, Oracle doesn't support identifiers over 30 chars in length, so the L name is shortened and appended with half of an MD5 hash. -See L. +See L. =cut @@ -628,7 +646,7 @@ sub relname_to_table_alias { my $alias = $self->next::method(@_); # we need to shorten here in addition to the shortening in SQLA itself, - # since the final relnames are a crucial for the join optimizer + # since the final relnames are crucial for the join optimizer return $self->sql_maker->_shorten_identifier($alias); } @@ -686,7 +704,7 @@ and child rows of the hierarchy. # person me # CONNECT BY # parentid = prior persionid - + connect_by_nocycle => { parentid => 'prior personid' } @@ -745,13 +763,16 @@ It uses the same syntax as L # ORDER SIBLINGS BY # firstname ASC -=head1 AUTHOR +=head1 FURTHER QUESTIONS? -See L and L. +Check the list of L. -=head1 LICENSE +=head1 COPYRIGHT AND 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