X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI.pm;h=1c1ddfe1e7dfc43d543df7944a24a07c06178527;hb=9c1a4b61a3fe975792eb6bceb57a0c456c03cfaf;hp=341d9f9f504f4d8c4f88a2df62e04b39f5fa864d;hpb=fcc2ec1189b0cac47db5aa7c5c73c190b66fb7a8;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI.pm b/lib/DBIx/Class/Storage/DBI.pm index 341d9f9..1c1ddfe 100644 --- a/lib/DBIx/Class/Storage/DBI.pm +++ b/lib/DBIx/Class/Storage/DBI.pm @@ -452,7 +452,11 @@ sub connect_info { } sub _default_dbi_connect_attributes { - return { AutoCommit => 1 }; + return { + AutoCommit => 1, + RaiseError => 1, + PrintError => 0, + }; } =head2 on_connect_do @@ -551,6 +555,7 @@ sub dbh_do { } }; + # ->connected might unset $@ - copy my $exception = $@; if(!$exception) { return $want_array ? @result : $result[0] } @@ -558,6 +563,8 @@ sub dbh_do { # We were not connected - reconnect and retry, but let any # exception fall right through this time + carp "Retrying $code after catching disconnected exception: $exception" + if $ENV{DBIC_DBIRETRY_DEBUG}; $self->_populate_dbh; $self->$code($self->_dbh, @_); } @@ -598,6 +605,7 @@ sub txn_do { $self->txn_commit; }; + # ->connected might unset $@ - copy my $exception = $@; if(!$exception) { return $want_array ? @result : $result[0] } @@ -619,6 +627,8 @@ sub txn_do { # We were not connected, and was first try - reconnect and retry # via the while loop + carp "Retrying $coderef after catching disconnected exception: $exception" + if $ENV{DBIC_DBIRETRY_DEBUG}; $self->_populate_dbh; } } @@ -688,22 +698,32 @@ answering, etc.) This method is used internally by L. =cut sub connected { - my ($self) = @_; + my $self = shift; + return 0 unless $self->_seems_connected; - if(my $dbh = $self->_dbh) { - if(defined $self->_conn_tid && $self->_conn_tid != threads->tid) { - $self->_dbh(undef); - $self->{_dbh_gen}++; - return; - } - else { - $self->_verify_pid; - return 0 if !$self->_dbh; - } - return ($dbh->FETCH('Active') && $self->_ping); + #be on the safe side + local $self->_dbh->{RaiseError} = 1; + + return $self->_ping; +} + +sub _seems_connected { + my $self = shift; + + my $dbh = $self->_dbh + or return 0; + + if(defined $self->_conn_tid && $self->_conn_tid != threads->tid) { + $self->_dbh(undef); + $self->{_dbh_gen}++; + return 0; + } + else { + $self->_verify_pid; + return 0 if !$self->_dbh; } - return 0; + return $dbh->FETCH('Active'); } sub _ping { @@ -740,7 +760,9 @@ sub ensure_connected { Returns a C<$dbh> - a data base handle of class L. The returned handle is guaranteed to be healthy by implicitly calling L, and if -necessary performing a reconnection before returning. +necessary performing a reconnection before returning. Keep in mind that this +is very B on some database engines. Consider using L +instead. =cut @@ -755,17 +777,8 @@ sub dbh { return $self->_dbh; } -=head2 last_dbh - -This returns the B available C<$dbh> if any, or attempts to -connect and returns the resulting handle. This method differs from -L by not validating if a preexisting handle is still healthy -via L. Make sure you take appropriate precautions -when using this method, as the C<$dbh> may be useless at this point. - -=cut - -sub last_dbh { +# this is the internal "get dbh or connect (don't check)" method +sub _get_dbh { my $self = shift; $self->_populate_dbh unless $self->_dbh; return $self->_dbh; @@ -777,7 +790,7 @@ sub _sql_maker_args { return ( bindtype=>'columns', array_datatypes => 1, - limit_dialect => $self->last_dbh, + limit_dialect => $self->_get_dbh, %{$self->_sql_maker_opts} ); } @@ -798,6 +811,7 @@ sub _populate_dbh { my ($self) = @_; my @info = @{$self->_dbi_connect_info || []}; + $self->_dbh(undef); # in case ->connected failed we might get sent here $self->_dbh($self->_connect(@info)); $self->_conn_pid($$); @@ -1250,7 +1264,7 @@ sub insert { $updated_cols->{$col} = $to_insert->{$col} = $self->_sequence_fetch( 'nextval', $col_info->{sequence} || - $self->_dbh_get_autoinc_seq($self->last_dbh, $source) + $self->_dbh_get_autoinc_seq($self->_get_dbh, $source) ); } } @@ -1583,179 +1597,224 @@ sub _select_args { sub _adjust_select_args_for_complex_prefetch { my ($self, $from, $select, $where, $attrs) = @_; - $self->throw_exception ('Complex prefetches are not supported on resultsets with a custom from attribute') - if (ref $from ne 'ARRAY'); + $self->throw_exception ('Nothing to prefetch... how did we get here?!') + if not @{$attrs->{_prefetch_select}}; - # copies for mangling - $from = [ @$from ]; - $select = [ @$select ]; - $attrs = { %$attrs }; + $self->throw_exception ('Complex prefetches are not supported on resultsets with a custom from attribute') + if (ref $from ne 'ARRAY' || ref $from->[0] ne 'HASH' || ref $from->[1] ne 'ARRAY'); - # separate attributes - my $sub_attrs = { %$attrs }; - delete $attrs->{$_} for qw/where bind rows offset group_by having/; - delete $sub_attrs->{$_} for qw/for collapse _prefetch_select _collapse_order_by select as/; - my $select_root_alias = $attrs->{alias}; - my $sql_maker = $self->sql_maker; + # generate inner/outer attribute lists, remove stuff that doesn't apply + my $outer_attrs = { %$attrs }; + delete $outer_attrs->{$_} for qw/where bind rows offset group_by having/; - # create subquery select list - consider only stuff *not* brought in by the prefetch - my $sub_select = []; - my $sub_group_by; - for my $i (0 .. @{$attrs->{select}} - @{$attrs->{_prefetch_select}} - 1) { - my $sel = $attrs->{select}[$i]; - - # alias any functions to the dbic-side 'as' label - # adjust the outer select accordingly - if (ref $sel eq 'HASH' && !$sel->{-select}) { - $sel = { -select => $sel, -as => $attrs->{as}[$i] }; - $select->[$i] = join ('.', $attrs->{alias}, ($attrs->{as}[$i] || "select_$i") ); - } + my $inner_attrs = { %$attrs }; + delete $inner_attrs->{$_} for qw/for collapse _prefetch_select _collapse_order_by select as/; - push @$sub_select, $sel; - } # bring over all non-collapse-induced order_by into the inner query (if any) # the outer one will have to keep them all - delete $sub_attrs->{order_by}; - if (my $ord_cnt = @{$attrs->{order_by}} - @{$attrs->{_collapse_order_by}} ) { - $sub_attrs->{order_by} = [ - @{$attrs->{order_by}}[ 0 .. $ord_cnt - 1] + delete $inner_attrs->{order_by}; + if (my $ord_cnt = @{$outer_attrs->{order_by}} - @{$outer_attrs->{_collapse_order_by}} ) { + $inner_attrs->{order_by} = [ + @{$outer_attrs->{order_by}}[ 0 .. $ord_cnt - 1] ]; } - # mangle {from}, keep in mind that $from is "headless" from here on - my $join_root = shift @$from; - my %inner_joins; - my %join_info = map { $_->[0]{-alias} => $_->[0] } (@$from); + # generate the inner/outer select lists + # for inside we consider only stuff *not* brought in by the prefetch + # on the outside we substitute any function for its alias + my $outer_select = [ @$select ]; + my $inner_select = []; + for my $i (0 .. ( @$outer_select - @{$outer_attrs->{_prefetch_select}} - 1) ) { + my $sel = $outer_select->[$i]; - # in complex search_related chains $select_root_alias may *not* be - # 'me' so always include it in the inner join - $inner_joins{$select_root_alias} = 1 if ($join_root->{-alias} ne $select_root_alias); + if (ref $sel eq 'HASH' ) { + $sel->{-as} ||= $attrs->{as}[$i]; + $outer_select->[$i] = join ('.', $attrs->{alias}, ($sel->{-as} || "inner_column_$i") ); + } + push @$inner_select, $sel; + } - # decide which parts of the join will remain on the inside - # - # this is not a very viable optimisation, but it was written - # before I realised this, so might as well remain. We can throw - # away _any_ branches of the join tree that are: - # 1) not mentioned in the condition/order - # 2) left-join leaves (or left-join leaf chains) - # Most of the join conditions will not satisfy this, but for real - # complex queries some might, and we might make some RDBMS happy. - # - # - # since we do not have introspectable SQLA, we fall back to ugly - # scanning of raw SQL for WHERE, and for pieces of ORDER BY - # in order to determine what goes into %inner_joins + # normalize a copy of $from, so it will be easier to work with further + # down (i.e. promote the initial hashref to an AoH) + $from = [ @$from ]; + $from->[0] = [ $from->[0] ]; + my %original_join_info = map { $_->[0]{-alias} => $_->[0] } (@$from); + + + # decide which parts of the join will remain in either part of + # the outer/inner query + + # First we compose a list of which aliases are used in restrictions + # (i.e. conditions/order/grouping/etc). Since we do not have + # introspectable SQLA, we fall back to ugly scanning of raw SQL for + # WHERE, and for pieces of ORDER BY in order to determine which aliases + # need to appear in the resulting sql. # It may not be very efficient, but it's a reasonable stop-gap + # Also unqualified column names will not be considered, but more often + # than not this is actually ok + # + # In the same loop we enumerate part of the selection aliases, as + # it requires the same sqla hack for the time being + my ($restrict_aliases, $select_aliases, $prefetch_aliases); { # produce stuff unquoted, so it can be scanned + my $sql_maker = $self->sql_maker; local $sql_maker->{quote_char}; my $sep = $self->_sql_maker_opts->{name_sep} || '.'; $sep = "\Q$sep\E"; - my @order_by = (map + my $non_prefetch_select_sql = $sql_maker->_recurse_fields ($inner_select); + my $prefetch_select_sql = $sql_maker->_recurse_fields ($outer_attrs->{_prefetch_select}); + my $where_sql = $sql_maker->where ($where); + my $group_by_sql = $sql_maker->_order_by({ + map { $_ => $inner_attrs->{$_} } qw/group_by having/ + }); + my @non_prefetch_order_by_chunks = (map { ref $_ ? $_->[0] : $_ } - $sql_maker->_order_by_chunks ($sub_attrs->{order_by}) + $sql_maker->_order_by_chunks ($inner_attrs->{order_by}) ); - my $where_sql = $sql_maker->where ($where); - my $select_sql = $sql_maker->_recurse_fields ($sub_select); - # sort needed joins - for my $alias (keys %join_info) { + for my $alias (keys %original_join_info) { + my $seen_re = qr/\b $alias $sep/x; - # any table alias found on a column name in where or order_by - # gets included in %inner_joins - # Also any parent joins that are needed to reach this particular alias - for my $piece ($select_sql, $where_sql, @order_by ) { - if ($piece =~ /\b $alias $sep/x) { - $inner_joins{$alias} = 1; + for my $piece ($where_sql, $group_by_sql, @non_prefetch_order_by_chunks ) { + if ($piece =~ $seen_re) { + $restrict_aliases->{$alias} = 1; } } + + if ($non_prefetch_select_sql =~ $seen_re) { + $select_aliases->{$alias} = 1; + } + + if ($prefetch_select_sql =~ $seen_re) { + $prefetch_aliases->{$alias} = 1; + } + } } - # scan for non-leaf/non-left joins and mark as needed - # also mark all ancestor joins that are needed to reach this particular alias - # (e.g. join => { cds => 'tracks' } - tracks will bring cds too ) - # - # traverse by the size of the -join_path i.e. reverse depth first - for my $alias (sort { @{$join_info{$b}{-join_path}} <=> @{$join_info{$a}{-join_path}} } (keys %join_info) ) { - - my $j = $join_info{$alias}; - $inner_joins{$alias} = 1 if (! $j->{-join_type} || ($j->{-join_type} !~ /^left$/i) ); + # Add any non-left joins to the restriction list (such joins are indeed restrictions) + for my $j (values %original_join_info) { + my $alias = $j->{-alias} or next; + $restrict_aliases->{$alias} = 1 if ( + (not $j->{-join_type}) + or + ($j->{-join_type} !~ /^left (?: \s+ outer)? $/xi) + ); + } - if ($inner_joins{$alias}) { - $inner_joins{$_} = 1 for (@{$j->{-join_path}}); + # mark all join parents as mentioned + # (e.g. join => { cds => 'tracks' } - tracks will need to bring cds too ) + for my $collection ($restrict_aliases, $select_aliases) { + for my $alias (keys %$collection) { + $collection->{$_} = 1 + for (@{ $original_join_info{$alias}{-join_path} || [] }); } } # construct the inner $from for the subquery - my $inner_from = [ $join_root ]; + my %inner_joins = (map { %{$_ || {}} } ($restrict_aliases, $select_aliases) ); + my @inner_from; for my $j (@$from) { - push @$inner_from, $j if $inner_joins{$j->[0]{-alias}}; + push @inner_from, $j if $inner_joins{$j->[0]{-alias}}; } # if a multi-type join was needed in the subquery ("multi" is indicated by # presence in {collapse}) - add a group_by to simulate the collapse in the subq - unless ($sub_attrs->{group_by}) { + unless ($inner_attrs->{group_by}) { for my $alias (keys %inner_joins) { # the dot comes from some weirdness in collapse # remove after the rewrite if ($attrs->{collapse}{".$alias"}) { - $sub_attrs->{group_by} ||= $sub_select; + $inner_attrs->{group_by} ||= $inner_select; last; } } } + # demote the inner_from head + $inner_from[0] = $inner_from[0][0]; + # generate the subquery my $subq = $self->_select_args_to_query ( - $inner_from, - $sub_select, + \@inner_from, + $inner_select, $where, - $sub_attrs + $inner_attrs, ); + my $subq_joinspec = { - -alias => $select_root_alias, - -source_handle => $join_root->{-source_handle}, - $select_root_alias => $subq, + -alias => $attrs->{alias}, + -source_handle => $inner_from[0]{-source_handle}, + $attrs->{alias} => $subq, }; - # Generate a new from (really just replace the join slot with the subquery) - # Before we would start the outer chain from the subquery itself (i.e. - # SELECT ... FROM (SELECT ... ) alias JOIN ..., but this turned out to be - # a bad idea for search_related, as the root of the chain was effectively - # lost (i.e. $artist_rs->search_related ('cds'... ) would result in alias - # of 'cds', which would prevent from doing things like order_by artist.*) - # See t/prefetch/via_search_related.t for a better idea + # Generate the outer from - this is relatively easy (really just replace + # the join slot with the subquery), with a major caveat - we can not + # join anything that is non-selecting (not part of the prefetch), but at + # the same time is a multi-type relationship, as it will explode the result. + # + # There are two possibilities here + # - either the join is non-restricting, in which case we simply throw it away + # - it is part of the restrictions, in which case we need to collapse the outer + # result by tackling yet another group_by to the outside of the query + + # so first generate the outer_from, up to the substitution point my @outer_from; - if ($join_root->{-alias} eq $select_root_alias) { # just swap the root part and we're done - @outer_from = ( - $subq_joinspec, - @$from, - ) - } - else { # this is trickier - @outer_from = ($join_root); - - for my $j (@$from) { - if ($j->[0]{-alias} eq $select_root_alias) { - push @outer_from, [ - $subq_joinspec, - @{$j}[1 .. $#$j], - ]; - } - else { - push @outer_from, $j; - } + while (my $j = shift @$from) { + if ($j->[0]{-alias} eq $attrs->{alias}) { # time to swap + push @outer_from, [ + $subq_joinspec, + @{$j}[1 .. $#$j], + ]; + last; # we'll take care of what's left in $from below + } + else { + push @outer_from, $j; + } + } + + # see what's left - throw away if not selecting/restricting + # also throw in a group_by if restricting to guard against + # cross-join explosions + # + while (my $j = shift @$from) { + my $alias = $j->[0]{-alias}; + + if ($select_aliases->{$alias} || $prefetch_aliases->{$alias}) { + push @outer_from, $j; + } + elsif ($restrict_aliases->{$alias}) { + push @outer_from, $j; + + # FIXME - this should be obviated by SQLA2, as I'll be able to + # have restrict_inner and restrict_outer... or something to that + # effect... I think... + + # FIXME2 - I can't find a clean way to determine if a particular join + # is a multi - instead I am just treating everything as a potential + # explosive join (ribasushi) + # + # if (my $handle = $j->[0]{-source_handle}) { + # my $rsrc = $handle->resolve; + # ... need to bail out of the following if this is not a multi, + # as it will be much easier on the db ... + + $outer_attrs->{group_by} ||= $outer_select; + # } } } + # demote the outer_from head + $outer_from[0] = $outer_from[0][0]; + # This is totally horrific - the $where ends up in both the inner and outer query # Unfortunately not much can be done until SQLA2 introspection arrives, and even # then if where conditions apply to the *right* side of the prefetch, you may have @@ -1763,7 +1822,7 @@ sub _adjust_select_args_for_complex_prefetch { # the outer select to exclude joins you didin't want in the first place # # OTOH it can be seen as a plus: (notes that this query would make a DBA cry ;) - return (\@outer_from, $select, $where, $attrs); + return (\@outer_from, $outer_select, $where, $outer_attrs); } sub _resolve_ident_sources { @@ -1886,9 +1945,6 @@ sub _order_select_columns { return @{$_[2]}; } - - - sub source_bind_attributes { my ($self, $source) = @_; @@ -2054,13 +2110,83 @@ sub last_insert_id { $self->dbh_do('_dbh_last_insert_id', @_); } +=head2 _native_data_type + +=over 4 + +=item Arguments: $type_name + +=back + +This API is B, will almost definitely change in the future, and +currently only used by L<::AutoCast|DBIx::Class::Storage::DBI::AutoCast> and +L<::Sybase|DBIx::Class::Storage::DBI::Sybase>. + +The default implementation returns C, implement in your Storage driver if +you need this functionality. + +Should map types from other databases to the native RDBMS type, for example +C to C. + +Types with modifiers should map to the underlying data type. For example, +C should become C. + +Composite types should map to the container type, for example +C becomes C. + +=cut + +sub _native_data_type { + #my ($self, $data_type) = @_; + return undef +} + +# Check if placeholders are supported at all +sub _placeholders_supported { + my $self = shift; + my $dbh = $self->_get_dbh; + + # some drivers provide a $dbh attribute (e.g. Sybase and $dbh->{syb_dynamic_supported}) + # but it is inaccurate more often than not + eval { + local $dbh->{PrintError} = 0; + local $dbh->{RaiseError} = 1; + $dbh->do('select ?', {}, 1); + }; + return $@ ? 0 : 1; +} + +# Check if placeholders bound to non-string types throw exceptions +# +sub _typeless_placeholders_supported { + my $self = shift; + my $dbh = $self->_get_dbh; + + eval { + local $dbh->{PrintError} = 0; + local $dbh->{RaiseError} = 1; + # this specifically tests a bind that is NOT a string + $dbh->do('select 1 where 1 = ?', {}, 1); + }; + return $@ ? 0 : 1; +} + =head2 sqlt_type Returns the database driver name. =cut -sub sqlt_type { shift->last_dbh->{Driver}->{Name} } +sub sqlt_type { + my ($self) = @_; + + if (not $self->_driver_determined) { + $self->_determine_driver; + goto $self->can ('sqlt_type'); + } + + $self->_get_dbh->{Driver}->{Name}; +} =head2 bind_attribute_by_data_type @@ -2306,8 +2432,6 @@ See L for a list of values for C<$sqlt_args>. sub deployment_statements { my ($self, $schema, $type, $version, $dir, $sqltargs) = @_; - # Need to be connected to get the correct sqlt_type - $self->last_dbh() unless $type; $type ||= $self->sqlt_type; $version ||= $schema->schema_version || '1.x'; $dir ||= './'; @@ -2326,18 +2450,18 @@ sub deployment_statements { . $self->_check_sqlt_message . q{'}) if !$self->_check_sqlt_version; - require SQL::Translator::Parser::DBIx::Class; - eval qq{use SQL::Translator::Producer::${type}}; - $self->throw_exception($@) if $@; - # sources needs to be a parser arg, but for simplicty allow at top level # coming in $sqltargs->{parser_args}{sources} = delete $sqltargs->{sources} if exists $sqltargs->{sources}; - my $tr = SQL::Translator->new(%$sqltargs); - SQL::Translator::Parser::DBIx::Class::parse( $tr, $schema ); - return "SQL::Translator::Producer::${type}"->can('produce')->($tr); + my $tr = SQL::Translator->new( + producer => "SQL::Translator::Producer::${type}", + %$sqltargs, + parser => 'SQL::Translator::Parser::DBIx::Class', + data => $schema, + ); + return $tr->translate; } sub deploy { @@ -2352,10 +2476,9 @@ sub deploy { return if $line =~ /^\s+$/; # skip whitespace only $self->_query_start($line); eval { - # a previous error may invalidate $dbh - thus we need to use dbh() - # to guarantee a healthy $dbh (this is temporary until we get - # proper error handling on deploy() ) - $self->dbh->do($line); + # do a dbh_do cycle here, as we need some error checking in + # place (even though we will ignore errors) + $self->dbh_do (sub { $_[1]->do($line) }); }; if ($@) { carp qq{$@ (running "${line}")}; @@ -2384,7 +2507,7 @@ Returns the datetime parser class sub datetime_parser { my $self = shift; return $self->{datetime_parser} ||= do { - $self->last_dbh; + $self->_populate_dbh unless $self->_dbh; $self->build_datetime_parser(@_); }; } @@ -2455,8 +2578,13 @@ sub lag_behind_master { sub DESTROY { my $self = shift; - return if !$self->_dbh; - $self->_verify_pid; + $self->_verify_pid if $self->_dbh; + + # some databases need this to stop spewing warnings + if (my $dbh = $self->_dbh) { + eval { $dbh->disconnect }; + } + $self->_dbh(undef); }