X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSQLMaker%2FLimitDialects.pm;h=2062021624a744ea8f4fa654377ef47f44d11aa5;hb=d77ee505c77d14a8a89cf356a014e7fbdc4e3967;hp=55a44e64a9a76df4ed4069cd5c92e9c17cc23e8c;hpb=cccd1876f48654bb612e8f3f9b16d786321340d2;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/SQLMaker/LimitDialects.pm b/lib/DBIx/Class/SQLMaker/LimitDialects.pm index 55a44e6..2062021 100644 --- a/lib/DBIx/Class/SQLMaker/LimitDialects.pm +++ b/lib/DBIx/Class/SQLMaker/LimitDialects.pm @@ -96,21 +96,24 @@ sub _RowNumberOver { my ($self, $sql, $rs_attrs, $rows, $offset ) = @_; # get selectors, and scan the order_by (if any) - my ($stripped_sql, $in_sel, $out_sel, $alias_map, $extra_order_sel) - = $self->_subqueried_limit_attrs ( $sql, $rs_attrs ); + my $sq_attrs = $self->_subqueried_limit_attrs ( $sql, $rs_attrs ); # make up an order if none exists my $requested_order = (delete $rs_attrs->{order_by}) || $self->_rno_default_order; + + # the order binds (if any) will need to go at the end of the entire inner select + local $self->{order_bind}; my $rno_ord = $self->_order_by ($requested_order); + push @{$self->{select_bind}}, @{$self->{order_bind}}; # this is the order supplement magic - my $mid_sel = $out_sel; - if ($extra_order_sel) { + my $mid_sel = $sq_attrs->{selection_outer}; + if (my $extra_order_sel = $sq_attrs->{order_supplement}) { for my $extra_col (sort { $extra_order_sel->{$a} cmp $extra_order_sel->{$b} } keys %$extra_order_sel ) { - $in_sel .= sprintf (', %s AS %s', + $sq_attrs->{selection_inner} .= sprintf (', %s AS %s', $extra_col, $extra_order_sel->{$extra_col}, ); @@ -118,10 +121,10 @@ sub _RowNumberOver { } # and this is order re-alias magic - for ($extra_order_sel, $alias_map) { - for my $col (keys %$_) { + for my $map ($sq_attrs->{order_supplement}, $sq_attrs->{outer_renames}) { + for my $col (sort { (length $b) <=> (length $a) } keys %{$map||{}} ) { my $re_col = quotemeta ($col); - $rno_ord =~ s/$re_col/$_->{$col}/; + $rno_ord =~ s/$re_col/$map->{$col}/; } } @@ -135,9 +138,9 @@ sub _RowNumberOver { return <{selection_outer} FROM ( SELECT $mid_sel, ROW_NUMBER() OVER( $rno_ord ) AS $idx_name FROM ( - SELECT $in_sel ${stripped_sql}${group_having} + SELECT $sq_attrs->{selection_inner} $sq_attrs->{query_leftover}${group_having} ) $qalias ) $qalias WHERE $idx_name >= ? AND $idx_name <= ? @@ -243,7 +246,7 @@ Supported by B. sub _RowNum { my ( $self, $sql, $rs_attrs, $rows, $offset ) = @_; - my ($stripped_sql, $insel, $outsel) = $self->_subqueried_limit_attrs ($sql, $rs_attrs); + my $sq_attrs = $self->_subqueried_limit_attrs ($sql, $rs_attrs); my $qalias = $self->_quote ($rs_attrs->{alias}); my $idx_name = $self->_quote ('rownum__index'); @@ -255,8 +258,8 @@ sub _RowNum { push @{$self->{limit_bind}}, [ $self->__rows_bindtype => $rows ]; return <{selection_outer} FROM ( + SELECT $sq_attrs->{selection_inner} $sq_attrs->{query_leftover}${order_group_having} ) $qalias WHERE ROWNUM <= ? EOS } @@ -276,15 +279,15 @@ EOS $rs_attrs->{order_by} and $rs_attrs->{_rsroot_rsrc}->storage->_order_by_is_stable( - $rs_attrs->{from}, $rs_attrs->{order_by} + @{$rs_attrs}{qw/from order_by where/} ) ) { push @{$self->{limit_bind}}, [ $self->__total_bindtype => $offset + $rows ], [ $self->__offset_bindtype => $offset + 1 ]; return <{selection_outer} FROM ( + SELECT $sq_attrs->{selection_outer}, ROWNUM $idx_name FROM ( + SELECT $sq_attrs->{selection_inner} $sq_attrs->{query_leftover}${order_group_having} ) $qalias WHERE ROWNUM <= ? ) $qalias WHERE $idx_name >= ? EOS @@ -293,9 +296,9 @@ EOS push @{$self->{limit_bind}}, [ $self->__offset_bindtype => $offset + 1 ], [ $self->__total_bindtype => $offset + $rows ]; return <{selection_outer} FROM ( + SELECT $sq_attrs->{selection_outer}, ROWNUM $idx_name FROM ( + SELECT $sq_attrs->{selection_inner} $sq_attrs->{query_leftover}${order_group_having} ) $qalias ) $qalias WHERE $idx_name BETWEEN ? AND ? EOS @@ -307,103 +310,95 @@ sub _prep_for_skimming_limit { my ( $self, $sql, $rs_attrs ) = @_; # get selectors - my (%r, $alias_map, $extra_order_sel); - ($r{inner_sql}, $r{in_sel}, $r{out_sel}, $alias_map, $extra_order_sel) - = $self->_subqueried_limit_attrs ($sql, $rs_attrs); + my $sq_attrs = $self->_subqueried_limit_attrs ($sql, $rs_attrs); my $requested_order = delete $rs_attrs->{order_by}; - $r{order_by_requested} = $self->_order_by ($requested_order); - - # make up an order unless supplied or sanity check what we are given - my $inner_order; - if ($r{order_by_requested}) { - $self->throw_exception ( - 'Unable to safely perform "skimming type" limit with supplied unstable order criteria' - ) unless $rs_attrs->{_rsroot_rsrc}->schema->storage->_order_by_is_stable( - $rs_attrs->{from}, - $requested_order - ); + $sq_attrs->{order_by_requested} = $self->_order_by ($requested_order); + $sq_attrs->{grpby_having} = $self->_parse_rs_attrs ($rs_attrs); - $inner_order = $requested_order; + # without an offset things are easy + if (! $rs_attrs->{offset}) { + $sq_attrs->{order_by_inner} = $sq_attrs->{order_by_requested}; } else { - $inner_order = [ map - { "$rs_attrs->{alias}.$_" } - ( @{ - $rs_attrs->{_rsroot_rsrc}->_identifying_column_set - || - $self->throw_exception(sprintf( - 'Unable to auto-construct stable order criteria for "skimming type" limit ' - . "dialect based on source '%s'", $rs_attrs->{_rsroot_rsrc}->name) ); - } ) - ]; - } + $sq_attrs->{quoted_rs_alias} = $self->_quote ($rs_attrs->{alias}); - # localise as we already have all the bind values we need - { + # localise as we already have all the bind values we need local $self->{order_bind}; - $r{order_by_inner} = $self->_order_by ($inner_order); + + # make up an order unless supplied or sanity check what we are given + my $inner_order; + if ($sq_attrs->{order_by_requested}) { + $self->throw_exception ( + 'Unable to safely perform "skimming type" limit with supplied unstable order criteria' + ) unless ($rs_attrs->{_rsroot_rsrc}->schema->storage->_order_by_is_stable( + $rs_attrs->{from}, + $requested_order, + $rs_attrs->{where}, + )); + + $inner_order = $requested_order; + } + else { + $inner_order = [ map + { "$rs_attrs->{alias}.$_" } + ( @{ + $rs_attrs->{_rsroot_rsrc}->_identifying_column_set + || + $self->throw_exception(sprintf( + 'Unable to auto-construct stable order criteria for "skimming type" limit ' + . "dialect based on source '%s'", $rs_attrs->{_rsroot_rsrc}->name) ); + } ) + ]; + } + + $sq_attrs->{order_by_inner} = $self->_order_by ($inner_order); my @out_chunks; for my $ch ($self->_order_by_chunks ($inner_order)) { $ch = $ch->[0] if ref $ch eq 'ARRAY'; - $ch =~ s/\s+ ( ASC|DESC ) \s* $//ix; - my $dir = uc ($1||'ASC'); - - push @out_chunks, \join (' ', $ch, $dir eq 'ASC' ? 'DESC' : 'ASC' ); + 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' ); } - $r{order_by_reversed} = $self->_order_by (\@out_chunks); - } + $sq_attrs->{order_by_middle} = $self->_order_by (\@out_chunks); - # this is the order supplement magic - $r{mid_sel} = $r{out_sel}; - if ($extra_order_sel) { - for my $extra_col (sort - { $extra_order_sel->{$a} cmp $extra_order_sel->{$b} } - keys %$extra_order_sel - ) { - $r{in_sel} .= sprintf (', %s AS %s', - $extra_col, - $extra_order_sel->{$extra_col}, - ); + # this is the order supplement magic + $sq_attrs->{selection_middle} = $sq_attrs->{selection_outer}; + if (my $extra_order_sel = $sq_attrs->{order_supplement}) { + for my $extra_col (sort + { $extra_order_sel->{$a} cmp $extra_order_sel->{$b} } + keys %$extra_order_sel + ) { + $sq_attrs->{selection_inner} .= sprintf (', %s AS %s', + $extra_col, + $extra_order_sel->{$extra_col}, + ); + + $sq_attrs->{selection_middle} .= ', ' . $extra_order_sel->{$extra_col}; + } - $r{mid_sel} .= ', ' . $extra_order_sel->{$extra_col}; + # Whatever order bindvals there are, they will be realiased and + # reselected, and need to show up at end of the initial inner select + push @{$self->{select_bind}}, @{$self->{order_bind}}; } - # Whatever order bindvals there are, they will be realiased and - # need to show up in front of the entire initial inner subquery - push @{$self->{pre_select_bind}}, @{$self->{order_bind}}; - } - - # if this is a part of something bigger, we need to add back all - # the extra order_by's, as they may be relied upon by the outside - # of a prefetch or something - if ($rs_attrs->{_is_internal_subuery} and keys %$extra_order_sel) { - $r{out_sel} .= sprintf ", $extra_order_sel->{$_} AS $_" - for sort - { $extra_order_sel->{$a} cmp $extra_order_sel->{$b} } - grep { $_ !~ /[^\w\-]/ } # ignore functions - keys %$extra_order_sel - ; - } - - # and this is order re-alias magic - for my $map ($extra_order_sel, $alias_map) { - for my $col (keys %$map) { - my $re_col = quotemeta ($col); - $_ =~ s/$re_col/$map->{$col}/ - for ($r{order_by_reversed}, $r{order_by_requested}); + # and this is order re-alias magic + for my $map ($sq_attrs->{order_supplement}, $sq_attrs->{outer_renames}) { + for my $col (sort { (length $b) <=> (length $a) } keys %{$map||{}}) { + my $re_col = quotemeta ($col); + $_ =~ s/$re_col/$map->{$col}/ + for ($sq_attrs->{order_by_middle}, $sq_attrs->{order_by_requested}); + } } } - # generate the rest of the sql - $r{grpby_having} = $self->_parse_rs_attrs ($rs_attrs); - - $r{quoted_rs_alias} = $self->_quote ($rs_attrs->{alias}); - - \%r; + $sq_attrs; } =head2 Top @@ -428,31 +423,32 @@ when $limit+$offset > total amount of rows in the resultset. sub _Top { my ( $self, $sql, $rs_attrs, $rows, $offset ) = @_; - my %l = %{ $self->_prep_for_skimming_limit($sql, $rs_attrs) }; + my $lim = $self->_prep_for_skimming_limit($sql, $rs_attrs); $sql = sprintf ('SELECT TOP %u %s %s %s %s', $rows + ($offset||0), - $l{in_sel}, - $l{inner_sql}, - $l{grpby_having}, - $l{order_by_inner}, + $offset ? $lim->{selection_inner} : $lim->{selection_original}, + $lim->{query_leftover}, + $lim->{grpby_having}, + $lim->{order_by_inner}, ); $sql = sprintf ('SELECT TOP %u %s FROM ( %s ) %s %s', $rows, - $l{mid_sel}, + $lim->{selection_middle}, $sql, - $l{quoted_rs_alias}, - $l{order_by_reversed}, + $lim->{quoted_rs_alias}, + $lim->{order_by_middle}, ) if $offset; - $sql = sprintf ('SELECT TOP %u %s FROM ( %s ) %s %s', - $rows, - $l{out_sel}, + $sql = sprintf ('SELECT %s FROM ( %s ) %s %s', + $lim->{selection_outer}, $sql, - $l{quoted_rs_alias}, - $l{order_by_requested}, - ) if ( ($offset && $l{order_by_requested}) || ($l{mid_sel} ne $l{out_sel}) ); + $lim->{quoted_rs_alias}, + $lim->{order_by_requested}, + ) if $offset and ( + $lim->{order_by_requested} or $lim->{selection_middle} ne $lim->{selection_outer} + ); return $sql; } @@ -482,31 +478,33 @@ when $limit+$offset > total amount of rows in the resultset. sub _FetchFirst { my ( $self, $sql, $rs_attrs, $rows, $offset ) = @_; - my %l = %{ $self->_prep_for_skimming_limit($sql, $rs_attrs) }; + my $lim = $self->_prep_for_skimming_limit($sql, $rs_attrs); $sql = sprintf ('SELECT %s %s %s %s FETCH FIRST %u ROWS ONLY', - $l{in_sel}, - $l{inner_sql}, - $l{grpby_having}, - $l{order_by_inner}, + $offset ? $lim->{selection_inner} : $lim->{selection_original}, + $lim->{query_leftover}, + $lim->{grpby_having}, + $lim->{order_by_inner}, $rows + ($offset||0), ); $sql = sprintf ('SELECT %s FROM ( %s ) %s %s FETCH FIRST %u ROWS ONLY', - $l{mid_sel}, + $lim->{selection_middle}, $sql, - $l{quoted_rs_alias}, - $l{order_by_reversed}, + $lim->{quoted_rs_alias}, + $lim->{order_by_middle}, $rows, ) if $offset; - $sql = sprintf ('SELECT %s FROM ( %s ) %s %s FETCH FIRST %u ROWS ONLY', - $l{out_sel}, + + $sql = sprintf ('SELECT %s FROM ( %s ) %s %s', + $lim->{selection_outer}, $sql, - $l{quoted_rs_alias}, - $l{order_by_requested}, - $rows, - ) if ( ($offset && $l{order_by_requested}) || ($l{mid_sel} ne $l{out_sel}) ); + $lim->{quoted_rs_alias}, + $lim->{order_by_requested}, + ) if $offset and ( + $lim->{order_by_requested} or $lim->{selection_middle} ne $lim->{selection_outer} + ); return $sql; } @@ -530,9 +528,9 @@ sub _RowCountOrGenericSubQ { return $self->_GenericSubQ(@_) if $offset; - return sprintf <<"EOF", $rows, $sql; + return sprintf <<"EOF", $rows, $sql, $self->_parse_rs_attrs( $rs_attrs ); SET ROWCOUNT %d -%s +%s %s SET ROWCOUNT 0 EOF } @@ -550,8 +548,11 @@ This is the most evil limit "dialect" (more of a hack) for I stupid databases. It works by ordering the set by some unique column, and calculating the amount of rows that have a less-er value (thus emulating a L-like index). Of course this implies the set can only be ordered by a single unique -column. Also note that this technique can be and often is B. +column. + +Also note that this technique can be and often is B. You +may have much better luck using L +instead. Currently used by B, due to lack of any other option. @@ -564,14 +565,16 @@ sub _GenericSubQ { my ($first_order_by) = 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.' ); - $first_order_by =~ s/\s+ ( ASC|DESC ) \s* $//ix; - my $direction = lc ($1 || 'asc'); + my $direction = ( + $first_order_by =~ s/\s+ ( ASC|DESC ) \s* $//ix + ) ? lc($1) : 'asc'; my ($first_ord_alias, $first_ord_col) = $first_order_by =~ /^ (?: ([^\.]+) \. )? ([^\.]+) $/x; @@ -586,17 +589,27 @@ sub _GenericSubQ { "Generic Subquery Limit first order criteria '$first_ord_col' must be unique" ) unless $root_rsrc->_identifying_column_set([$first_ord_col]); - my ($stripped_sql, $in_sel, $out_sel, $alias_map, $extra_order_sel) - = $self->_subqueried_limit_attrs ($sql, $rs_attrs); + 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); + }; my $cmp_op = $direction eq 'desc' ? '>' : '<'; my $count_tbl_alias = 'rownum__emulation'; - my $order_sql = $self->_order_by (delete $rs_attrs->{order_by}); + my ($order_sql, @order_bind) = do { + local $self->{order_bind}; + my $s = $self->_order_by (delete $rs_attrs->{order_by}); + ($s, @{$self->{order_bind}}); + }; my $group_having_sql = $self->_parse_rs_attrs($rs_attrs); + 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 keys %{$extra_order_sel||{}}; + $in_sel .= ", $_" for keys %{$sq_attrs->{order_supplement}}; my $rownum_cond; if ($offset) { @@ -615,10 +628,15 @@ sub _GenericSubQ { ; } + # 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; + return sprintf (" -SELECT $out_sel +SELECT $sq_attrs->{selection_outer} FROM ( - SELECT $in_sel ${stripped_sql}${group_having_sql} + 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 @@ -680,6 +698,7 @@ sub _subqueried_limit_attrs { my $sql_alias = (ref $s) eq 'HASH' ? $s->{-as} : undef; push @sel, { + arg => $s, sql => $sql_sel, unquoted_sql => do { local $self->{quote_char}; @@ -694,7 +713,9 @@ sub _subqueried_limit_attrs { , }; - $in_sel_index->{$sql_sel}++; + # anything with a placeholder in it needs re-selection + $in_sel_index->{$sql_sel}++ unless $sql_sel =~ / (?: ^ | \W ) \? (?: \W | $ ) /x; + $in_sel_index->{$self->_quote ($sql_alias)}++ if $sql_alias; # record unqualified versions too, so we do not have @@ -710,26 +731,32 @@ sub _subqueried_limit_attrs { # unless we are dealing with the current source alias # (which will transcend the subqueries as it is necessary # for possible further chaining) - my (@in_sel, @out_sel, %renamed); + # same for anything we do not recognize + my ($sel, $renamed); for my $node (@sel) { + push @{$sel->{original}}, $node->{sql}; + if ( + ! $in_sel_index->{$node->{sql}} + or $node->{as} =~ / (?{unquoted_sql} =~ / (?{as} = $self->_unqualify_colname($node->{as}); my $quoted_as = $self->_quote($node->{as}); - push @in_sel, sprintf '%s AS %s', $node->{sql}, $quoted_as; - push @out_sel, $quoted_as; - $renamed{$node->{sql}} = $quoted_as; + push @{$sel->{inner}}, sprintf '%s AS %s', $node->{sql}, $quoted_as; + push @{$sel->{outer}}, $quoted_as; + $renamed->{$node->{sql}} = $quoted_as; } else { - push @in_sel, $node->{sql}; - push @out_sel, $self->_quote ($node->{as}); + push @{$sel->{inner}}, $node->{sql}; + push @{$sel->{outer}}, $self->_quote (ref $node->{arg} ? $node->{as} : $node->{arg}); } } + # see if the order gives us anything - my %extra_order_sel; + my $extra_order_sel; for my $chunk ($self->_order_by_chunks ($rs_attrs->{order_by})) { # order with bind $chunk = $chunk->[0] if (ref $chunk) eq 'ARRAY'; @@ -737,20 +764,17 @@ sub _subqueried_limit_attrs { next if $in_sel_index->{$chunk}; - $extra_order_sel{$chunk} ||= $self->_quote ( - 'ORDER__BY__' . scalar keys %extra_order_sel + $extra_order_sel->{$chunk} ||= $self->_quote ( + 'ORDER__BY__' . sprintf '%03d', scalar keys %{$extra_order_sel||{}} ); } - return ( - $proto_sql, - (map { join (', ', @$_ ) } ( - \@in_sel, - \@out_sel) - ), - \%renamed, - keys %extra_order_sel ? \%extra_order_sel : (), - ); + return { + query_leftover => $proto_sql, + (map {( "selection_$_" => join (', ', @{$sel->{$_}} ) )} keys %$sel ), + outer_renames => $renamed, + order_supplement => $extra_order_sel, + }; } sub _unqualify_colname {