my ($f_aqt, $v_aqt) = $self->_expand_insert_values($data);
my @parts = ([ $self->_sqlcase('insert into').' '.$table ]);
- push @parts, [ $self->render_aqt($f_aqt) ] if $f_aqt;
- push @parts, [ $self->_sqlcase('values') ], [ $self->render_aqt($v_aqt) ];
+ push @parts, $self->render_aqt($f_aqt) if $f_aqt;
+ push @parts, [ $self->_sqlcase('values') ], $self->render_aqt($v_aqt);
if ($options->{returning}) {
push @parts, [ $self->_insert_returning($options) ];
my $f = $options->{returning};
- my ($sql, @bind) = $self->render_aqt(
+ my ($sql, @bind) = @{ $self->render_aqt(
$self->_expand_maybe_list_expr($f, -ident)
- );
- return wantarray
- ? $self->_sqlcase(' returning ') . $sql
- : ($self->_sqlcase(' returning ').$sql, @bind);
+ ) };
+ return ($self->_sqlcase(' returning ').$sql, @bind);
}
sub _expand_insert_value {
sub _update_set_values {
my ($self, $data) = @_;
- return $self->render_aqt(
+ return @{ $self->render_aqt(
$self->_expand_update_set_values(undef, $data),
- );
+ ) };
}
sub _expand_update_set_values {
sub _select_fields {
my ($self, $fields) = @_;
return $fields unless ref($fields);
- return $self->render_aqt(
+ return @{ $self->render_aqt(
$self->_expand_maybe_list_expr($fields, '-ident')
- );
+ ) };
}
#======================================================================
die "No" if @rest;
die "Not a node type: $k" unless $k =~ s/^-//;
if (my $meth = $self->{render}{$k}) {
- return $self->$meth($k, $v);
+ return [ $self->$meth($k, $v) ];
}
die "notreached: $k";
}
sub render_expr {
my ($self, $expr, $default_scalar_to) = @_;
- my ($sql, @bind) = $self->render_aqt(
+ return @{ $self->render_aqt(
$self->expand_expr($expr, $default_scalar_to)
- );
- return (wantarray ? ($sql, @bind) : $sql);
+ ) };
}
sub _normalize_op {
# dispatch expanded expression
- my ($sql, @bind) = defined($where_exp) ? $self->render_aqt($where_exp) : (undef);
+ my ($sql, @bind) = defined($where_exp) ? @{ $self->render_aqt($where_exp) } : (undef);
# DBIx::Class used to call _recurse_where in scalar context
# something else might too...
if (wantarray) {
unless $low->{-literal};
$low;
} else {
- +($low, [ $self->_sqlcase('and') ], $high);
+ +($low, $self->format_keyword('and'), $high);
}
};
- my ($lhsql, @lhbind) = $self->render_aqt($left);
return $self->join_query_parts(' ',
- [ '(' ],
- $left,
- [ $self->format_keyword($op) ],
- @rh,
- [ ')' ],
+ '(', $left, $self->format_keyword($op), @rh, ')',
);
}
sub _render_op_in {
my ($self, $op, $args) = @_;
my ($lhs, @rhs) = @$args;
- my @in_bind;
- my @in_sql = map {
- my ($sql, @bind) = $self->render_aqt($_);
- push @in_bind, @bind;
- $sql;
- } @rhs;
- my ($lhsql, @lbind) = $self->render_aqt($lhs);
- return (
- $lhsql.' '.$self->_sqlcase(join ' ', split '_', $op).' ( '
- .join(', ', @in_sql)
- .' )',
- @lbind, @in_bind
+
+ return $self->join_query_parts(' ',
+ $lhs,
+ $self->format_keyword($op),
+ '(',
+ [ $self->join_query_parts(', ', @rhs) ],
+ ')'
);
}
sub _render_op_andor {
my ($self, $op, $args) = @_;
- my @parts = map [ $self->render_aqt($_) ], @$args;
- return '' unless @parts;
- return @{$parts[0]} if @parts == 1;
- my ($sql, @bind) = $self->join_query_parts(' '.$self->_sqlcase($op).' ', @parts);
- return '( '.$sql.' )', @bind;
+ return '' unless @$args;
+ return $self->join_query_parts('', $args->[0]) if @$args == 1;
+ return $self->join_query_parts(
+ ' ' => '(',[ $self->_render_op_multop($op, $args) ], ')'
+ );
}
sub _render_op_multop {
my ($self, $op, $args) = @_;
- my @parts = map [ $self->render_aqt($_) ], @$args;
+ my @parts = @$args;
return '' unless @parts;
- return @{$parts[0]} if @parts == 1;
+ return @{$self->render_aqt($parts[0])} if @parts == 1;
my $join = ($op eq ','
? ', '
- : ' '.$self->_sqlcase(join ' ', split '_', $op).' '
+ : ' '.$self->format_keyword($op).' '
);
return $self->join_query_parts($join, @parts);
}
sub join_query_parts {
my ($self, $join, @parts) = @_;
- my @final = map +(ref($_) eq 'HASH' ? [ $self->render_aqt($_) ] : $_),
- @parts;
+ my @final = map +(
+ ref($_) eq 'HASH'
+ ? $self->render_aqt($_)
+ : ref($_) eq 'ARRAY' ? $_ : [ $_ ]),
+ @parts;
return (
join($join, map $_->[0], @final),
- (wantarray ? (map @{$_}[1..$#$_], @final) : ()),
+ (map @{$_}[1..$#$_], @final),
);
}
sub _render_unop_paren {
my ($self, $op, $v) = @_;
- my ($sql, @bind) = $self->_render_unop_prefix($op, $v);
- return "(${sql})", @bind;
+ return $self->join_query_parts('',
+ '(', [ $self->_render_unop_prefix($op, $v) ], ')'
+ );
}
sub _render_unop_prefix {
my ($self, $op, $v) = @_;
- my ($expr_sql, @bind) = $self->render_aqt($v->[0]);
-
- my $op_sql = $self->_sqlcase($op); # join ' ', split '_', $op);
- return ("${op_sql} ${expr_sql}", @bind);
+ return $self->join_query_parts(' ',
+ $self->_sqlcase($op), $v->[0]
+ );
}
sub _render_unop_postfix {
my ($self, $op, $v) = @_;
- my ($expr_sql, @bind) = $self->render_aqt($v->[0]);
- my $op_sql = $self->_sqlcase(join ' ', split '_', $op);
- return ($expr_sql.' '.$op_sql, @bind);
+ return $self->join_query_parts(' ',
+ $v->[0], $self->format_keyword($op),
+ );
}
# Some databases (SQLite) treat col IN (1, 2) different from
return '' unless defined(my $expanded = $self->_expand_order_by($arg));
- my ($sql, @bind) = $self->render_aqt($expanded);
+ my ($sql, @bind) = @{ $self->render_aqt($expanded) };
return '' unless length($sql);
my $final_sql = $self->_sqlcase(' order by ').$sql;
- return wantarray ? ($final_sql, @bind) : $final_sql;
+ return ($final_sql, @bind);
}
# _order_by no longer needs to call this so doesn't but DBIC uses it.
sub _chunkify_order_by {
my ($self, $expanded) = @_;
- return grep length, $self->render_aqt($expanded)
+ return grep length, @{ $self->render_aqt($expanded) }
if $expanded->{-ident} or @{$expanded->{-literal}||[]} == 1;
for ($expanded) {
my ($comma, @list) = @{$_->{-op}};
return map $self->_chunkify_order_by($_), @list;
}
- return [ $self->render_aqt($_) ];
+ return $self->render_aqt($_);
}
}
my $from = shift;
($self->render_aqt(
$self->_expand_maybe_list_expr($from, -ident)
- ))[0];
+ ))->[0];
}
# This allows us to check for a local, then _form, attr
my $self = shift;
my($name) = $AUTOLOAD =~ /.*::(.+)/;
+ puke "AUTOLOAD invoked for method name ${name} and allow_autoload option not set" unless $self->{allow_autoload};
return $self->generate($name, @_);
}