$self->_expand_maybe_list_expr( [
map {
my ($k, $set) = @$_;
+ $set = { -bind => $_ } unless defined $set;
+{ -op => [ '=', { -ident => $k }, $set ] };
}
map {
sub _select_fields {
my ($self, $fields) = @_;
+ return $fields unless ref($fields);
return $self->_render_expr(
$self->_expand_maybe_list_expr($fields, undef, '-ident')
);
die "notreached";
}
+my $Nest_Warned = 0;
+
sub _expand_expr_hashpair {
my ($self, $k, $v, $logic) = @_;
unless (defined($k) and length($k)) {
. "You probably wanted ...-and => [ $k => COND1, $k => COND2 ... ]";
}
if ($k eq '-nest') {
+ # DBIx::Class requires a nest warning to be emitted once but the private
+ # method it overrode to do so no longer exists
+ if (ref($self) =~ /^DBIx::Class::SQLMaker/) {
+ unless ($Nest_Warned) {
+ belch(
+ "-nest in search conditions is deprecated, you most probably wanted:\n"
+ .q|{..., -and => [ \%cond0, \@cond1, \'cond2', \[ 'cond3', [ col => bind ] ], etc. ], ... }|
+ );
+ $Nest_Warned = 1;
+ }
+ }
return $self->_expand_expr($v);
}
if ($k eq '-bool') {
#print STDERR Data::Dumper::Concise::Dumper([ $where, $logic ]);
- my $where_exp = $self->_expand_expr($where, $logic);
+ # Special case: top level simple string treated as literal
+
+ my $where_exp = (ref($where)
+ ? $self->_expand_expr($where, $logic)
+ : { -literal => [ $where ] });
#print STDERR Data::Dumper::Concise::Dumper([ EXP => $where_exp ]);
# ORDER BY
#======================================================================
-sub _order_by {
+sub _expand_order_by {
my ($self, $arg) = @_;
- return '' unless defined($arg) and not (ref($arg) eq 'ARRAY' and !@$arg);
+ return unless defined($arg) and not (ref($arg) eq 'ARRAY' and !@$arg);
my $expander = sub {
my ($self, $dir, $expr) = @_;
}
}
my @exp = map +(defined($dir) ? { -op => [ $dir => $_ ] } : $_),
- map $self->_expand_expr($_, undef, -ident), @to_expand;
+ map $self->_expand_expr($_, undef, -ident),
+ map ref($_) eq 'ARRAY' ? @$_ : $_, @to_expand;
return (@exp > 1 ? { -op => [ ',', @exp ] } : $exp[0]);
};
sub { shift->$expander(desc => @_) },
);
- my $expanded = $self->$expander(undef, $arg);
+ return $self->$expander(undef, $arg);
+}
+
+sub _order_by {
+ my ($self, $arg) = @_;
+
+ return '' unless defined(my $expanded = $self->_expand_order_by($arg));
my ($sql, @bind) = $self->_render_expr($expanded);
return wantarray ? ($final_sql, @bind) : $final_sql;
}
+sub _order_by_chunks {
+ my ($self, $arg) = @_;
+
+ return () unless defined(my $expanded = $self->_expand_order_by($arg));
+
+ for ($expanded) {
+ if (ref() eq 'HASH' and my $op = $_->{-op}) {
+ if ($op->[0] eq ',') {
+ return map [ $self->_render_expr($_) ], @{$op}[1..$#$op];
+ }
+ }
+ return [ $self->_render_expr($_) ];
+ }
+}
+
#======================================================================
# DATASOURCE (FOR NOW, JUST PLAIN TABLE OR LIST OF TABLES)
#======================================================================