# GLOBALS
#======================================================================
-our $VERSION = '1.72';
+our $VERSION = '1.73';
# This would confuse some packagers
$VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases
SCALARREF => sub {$$arg}, # literal SQL, no quoting
HASHREF => sub {
- # get first pair in hash
- my ($key, $val, @rest) = %$arg;
-
- return () unless $key;
-
- if ( @rest or not $key =~ /^-(desc|asc)/i ) {
- puke "hash passed to _order_by must have exactly one key (-desc or -asc)";
+ return () unless %$arg;
+
+ my ($direction, $nulls, $val);
+ foreach my $key (keys %$arg) {
+ if ( $key =~ /^-(desc|asc)/i ) {
+ puke "hash passed to _order_by must have exactly one of -desc or -asc"
+ if defined $direction;
+ $direction = $1;
+ $val = $arg->{$key};
+ } elsif ($key =~ /^-nulls$/i) {
+ $nulls = $arg->{$key};
+ puke "invalid value for -nulls" unless $nulls =~ /^(?:first|last)$/;
+ } else {
+ puke "invalid key in hash passed to _order_by";
+ }
}
-
- my $direction = $1;
+ puke "hash passed to _order_by must have exactly one of -desc or -asc"
+ unless defined $direction;
my @ret;
for my $c ($self->_order_by_chunks ($val)) {
},
});
- $sql = $sql . ' ' . $self->_sqlcase($direction);
+ $sql .= ' ' . $self->_sqlcase($direction);
+ $sql .= ' ' . $self->_sqlcase("nulls $nulls")
+ if defined $nulls;
push @ret, [ $sql, @bind];
}
Some functions take an order by clause. This can either be a scalar (just a
column name,) a hash of C<< { -desc => 'col' } >> or C<< { -asc => 'col' } >>,
+optionally with C<< -nulls => 'first' >> or C<< -nulls => 'last' >>,
or an array of either of the two previous forms. Examples:
Given | Will Generate
|
{-desc => 'colB'} | ORDER BY colB DESC
|
+ { |
+ -asc => 'colA', | ORDER BY colA ASC NULLS LAST
+ -nulls => 'last', |
+ } |
+ |
['colA', {-asc => 'colB'}] | ORDER BY colA, colB ASC
|
{ -asc => [qw/colA colB/] } | ORDER BY colA ASC, colB ASC
|
+ { |
+ -asc => [qw/colA colB/] | ORDER BY colA ASC NULLS FIRST,
+ -nulls => 'first' | colB ASC NULLS FIRST
+ } |
+ |
[ |
{ -asc => 'colA' }, | ORDER BY colA ASC, colB DESC,
{ -desc => [qw/colB/], | colC ASC, colD ASC