X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract%2FConverter.pm;h=935b601ae3a3bc4b8aadf39eeb7e4b3423249fbc;hb=e1ba0ad98de5b5877d5ca5eaf95e7c8c87d2afe1;hp=e5387ce555e67154678a1fcaf597c122b468acca;hpb=43da38192fd88dc86f14ff4a5fe2452b93a2e4df;p=dbsrgits%2FSQL-Abstract.git diff --git a/lib/SQL/Abstract/Converter.pm b/lib/SQL/Abstract/Converter.pm index e5387ce..935b601 100644 --- a/lib/SQL/Abstract/Converter.pm +++ b/lib/SQL/Abstract/Converter.pm @@ -536,7 +536,7 @@ sub _order_by_to_dq { my $dq = Order( undef, (defined($dir) ? (!!($dir =~ /desc/i)) : undef), - (defined($nulls) ? ($nulls =~ /first/i ? 1 : -1) : undef), + $nulls, ($from ? ($from) : undef), ); @@ -594,7 +594,7 @@ sub _order_by_to_dq { $val = $arg->{$key}; } elsif ($key =~ /^-nulls$/i) { $nulls = $arg->{$key}; - die "invalid value for -nulls" unless $nulls =~ /^(?:first|last)$/i; + die "invalid value for -nulls" unless $nulls =~ /^(?:first|last|none)$/i; } else { die "invalid key ${key} in hash passed to _order_by_to_dq"; }