X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSQLMaker%2FLimitDialects.pm;h=ec9300aece7326f395c70dd24929602a6982d2a9;hb=cb3e87f5f530f76ddf46924e6ec6bd3cc414ccd3;hp=a5ac4674735db88e4e982398df4bfff26690b1be;hpb=048c24409260d6c59e99f0d0adf8caafe5a78dd0;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/SQLMaker/LimitDialects.pm b/lib/DBIx/Class/SQLMaker/LimitDialects.pm index a5ac467..ec9300a 100644 --- a/lib/DBIx/Class/SQLMaker/LimitDialects.pm +++ b/lib/DBIx/Class/SQLMaker/LimitDialects.pm @@ -358,12 +358,10 @@ sub _prep_for_skimming_limit { for my $ch ($self->_order_by_chunks ($inner_order)) { $ch = $ch->[0] if ref $ch eq 'ARRAY'; - my $is_desc = ( - $ch =~ s/\s+ ( ASC|DESC ) \s* $//ix - and - uc($1) eq 'DESC' - ) ? 1 : 0; - push @out_chunks, \join (' ', $ch, $is_desc ? 'ASC' : 'DESC' ); + ($ch, my $is_desc) = $self->_split_order_chunk($ch); + + # !NOTE! outside chunks come in reverse order ( !$is_desc ) + push @out_chunks, { ($is_desc ? '-asc' : '-desc') => \$ch }; } $sq_attrs->{order_by_middle} = $self->_order_by (\@out_chunks); @@ -535,60 +533,106 @@ sub _GenericSubQ { my ($self, $sql, $rs_attrs, $rows, $offset) = @_; my $root_rsrc = $rs_attrs->{_rsroot_rsrc}; - my $root_tbl_name = $root_rsrc->name; - my ($first_order_by) = do { + # Explicitly require an order_by + # GenSubQ is slow enough as it is, just emulating things + # like in other cases is not wise - make the user work + # to shoot their DBA in the foot + my $supplied_order = delete $rs_attrs->{order_by} or $self->throw_exception ( + 'Generic Subquery Limit does not work on resultsets without an order. Provide a stable, ' + . 'root-table-based order criteria.' + ); + + my $usable_order_ci = $root_rsrc->storage->_main_source_order_by_portion_is_stable( + $root_rsrc, + $supplied_order, + $rs_attrs->{where}, + ) or $self->throw_exception( + 'Generic Subquery Limit can not work with order criteria based on sources other than the current one' + ); + +### +### +### we need to know the directions after we figured out the above - reextract *again* +### this is eyebleed - trying to get it to work at first + my @order_bits = do { local $self->{quote_char}; local $self->{order_bind}; - map { ref $_ ? $_->[0] : $_ } $self->_order_by_chunks ($rs_attrs->{order_by}) - } or $self->throw_exception ( - 'Generic Subquery Limit does not work on resultsets without an order. Provide a single, ' - . 'unique-column order criteria.' - ); + map { ref $_ ? $_->[0] : $_ } $self->_order_by_chunks ($supplied_order) + }; - my $direction = ( - $first_order_by =~ s/\s+ ( ASC|DESC ) \s* $//ix - ) ? lc($1) : 'asc'; + # truncate to what we'll use + $#order_bits = ( (keys %$usable_order_ci) - 1 ); - my ($first_ord_alias, $first_ord_col) = $first_order_by =~ /^ (?: ([^\.]+) \. )? ([^\.]+) $/x; + # @order_bits likely will come back quoted (due to how the prefetch + # rewriter operates + # Hence supplement the column_info lookup table with quoted versions + if ($self->quote_char) { + $usable_order_ci->{$self->_quote($_)} = $usable_order_ci->{$_} + for keys %$usable_order_ci; + } - $self->throw_exception(sprintf - "Generic Subquery Limit order criteria can be only based on the root-source '%s'" - . " (aliased as '%s')", $root_rsrc->source_name, $rs_attrs->{alias}, - ) if ($first_ord_alias and $first_ord_alias ne $rs_attrs->{alias}); +# calculate the condition + my $count_tbl_alias = 'rownum__emulation'; + my $root_alias = $rs_attrs->{alias}; + my $root_tbl_name = $root_rsrc->name; - $first_ord_alias ||= $rs_attrs->{alias}; + my (@unqualified_names, @qualified_names, @is_desc, @new_order_by); - $self->throw_exception( - "Generic Subquery Limit first order criteria '$first_ord_col' must be unique" - ) unless $root_rsrc->_identifying_column_set([$first_ord_col]); - - my $sq_attrs = do { - # perform the mangling only using the very first order crietria - # (the one we care about) - local $rs_attrs->{order_by} = $first_order_by; - $self->_subqueried_limit_attrs ($sql, $rs_attrs); - }; + for my $bit (@order_bits) { - my $cmp_op = $direction eq 'desc' ? '>' : '<'; - my $count_tbl_alias = 'rownum__emulation'; + ($bit, my $is_desc) = $self->_split_order_chunk($bit); - my ($order_sql, @order_bind) = do { - local $self->{order_bind}; - my $s = $self->_order_by (delete $rs_attrs->{order_by}); - ($s, @{$self->{order_bind}}); + push @is_desc, $is_desc; + push @unqualified_names, $usable_order_ci->{$bit}{-colname}; + push @qualified_names, $usable_order_ci->{$bit}{-fq_colname}; + + push @new_order_by, { ($is_desc ? '-desc' : '-asc') => $usable_order_ci->{$bit}{-fq_colname} }; }; - my $group_having_sql = $self->_parse_rs_attrs($rs_attrs); - my $in_sel = $sq_attrs->{selection_inner}; + my (@where_cond, @skip_colpair_stack); + for my $i (0 .. $#order_bits) { + my $ci = $usable_order_ci->{$order_bits[$i]}; + + my ($subq_col, $main_col) = map { "$_.$ci->{-colname}" } ($count_tbl_alias, $root_alias); + my $cur_cond = { $subq_col => { ($is_desc[$i] ? '>' : '<') => { -ident => $main_col } } }; + + push @skip_colpair_stack, [ + { $main_col => { -ident => $subq_col } }, + ]; + + # we can trust the nullability flag because + # we already used it during _id_col_set resolution + # + if ($ci->{is_nullable}) { + push @{$skip_colpair_stack[-1]}, { $main_col => undef, $subq_col=> undef }; + + $cur_cond = [ + { + ($is_desc[$i] ? $subq_col : $main_col) => { '!=', undef }, + ($is_desc[$i] ? $main_col : $subq_col) => undef, + }, + { + $subq_col => { '!=', undef }, + $main_col => { '!=', undef }, + -and => $cur_cond, + }, + ]; + } - # add the order supplement (if any) as this is what will be used for the outer WHERE - $in_sel .= ", $_" for keys %{$sq_attrs->{order_supplement}}; + push @where_cond, { '-and', => [ @skip_colpair_stack[0..$i-1], $cur_cond ] }; + } + +# reuse the sqlmaker WHERE, this will not be returning binds + my $counted_where = do { + local $self->{where_bind}; + $self->where(\@where_cond); + }; +# construct the rownum condition by hand my $rownum_cond; if ($offset) { $rownum_cond = 'BETWEEN ? AND ?'; - push @{$self->{limit_bind}}, [ $self->__offset_bindtype => $offset ], [ $self->__total_bindtype => $offset + $rows - 1] @@ -596,30 +640,51 @@ sub _GenericSubQ { } else { $rownum_cond = '< ?'; - push @{$self->{limit_bind}}, [ $self->__rows_bindtype => $rows ] ; } - # even though binds in order_by make no sense here (the rs needs to be - # ordered by a unique column first) - pass whatever there may be through - # anyway - push @{$self->{limit_bind}}, @order_bind; +# and what we will order by inside + my $inner_order_sql = do { + local $self->{order_bind}; + + my $s = $self->_order_by (\@new_order_by); + + $self->throw_exception('Inner gensubq order may not contain binds... something went wrong') + if @{$self->{order_bind}}; + + $s; + }; + +### resume originally scheduled programming +### +### + + # we need to supply the order for the supplements to be properly calculated + my $sq_attrs = $self->_subqueried_limit_attrs ( + $sql, { %$rs_attrs, order_by => \@new_order_by } + ); + + my $in_sel = $sq_attrs->{selection_inner}; + + # add the order supplement (if any) as this is what will be used for the outer WHERE + $in_sel .= ", $_" for sort keys %{$sq_attrs->{order_supplement}}; + + my $group_having_sql = $self->_parse_rs_attrs($rs_attrs); + return sprintf (" SELECT $sq_attrs->{selection_outer} FROM ( SELECT $in_sel $sq_attrs->{query_leftover}${group_having_sql} ) %s -WHERE ( SELECT COUNT(*) FROM %s %s WHERE %s $cmp_op %s ) $rownum_cond -$order_sql +WHERE ( SELECT COUNT(*) FROM %s %s $counted_where ) $rownum_cond +$inner_order_sql ", map { $self->_quote ($_) } ( $rs_attrs->{alias}, $root_tbl_name, $count_tbl_alias, - "$count_tbl_alias.$first_ord_col", - "$first_ord_alias.$first_ord_col", )); } @@ -734,7 +799,7 @@ sub _subqueried_limit_attrs { for my $chunk ($self->_order_by_chunks ($rs_attrs->{order_by})) { # order with bind $chunk = $chunk->[0] if (ref $chunk) eq 'ARRAY'; - $chunk =~ s/\s+ (?: ASC|DESC ) \s* $//ix; + ($chunk) = $self->_split_order_chunk($chunk); next if $in_sel_index->{$chunk};