my ($self) = @_;
$self->{clauses_of}{select} = [ qw(select from where order_by) ];
$self->{expand}{select} = sub { shift->_expand_statement(@_) };
- $self->{render}{select} = sub { shift->_render_statement(select => @_) };
+ $self->{render}{select} = sub { shift->_render_statement(@_) };
$self->{expand_clause}{"select.$_"} = "_expand_select_clause_$_"
for @{$self->{clauses_of}{select}};
$self->{clauses_of}{update} = [ qw(target set where returning) ];
$self->{expand}{update} = sub { shift->_expand_statement(@_) };
- $self->{render}{update} = sub { shift->_render_statement(update => @_) };
+ $self->{render}{update} = sub { shift->_render_statement(@_) };
$self->{expand_clause}{"update.$_"} = "_expand_update_clause_$_"
for @{$self->{clauses_of}{update}};
$self->{expand_clause}{'update.update'} = '_expand_update_clause_target';
};
$self->{clauses_of}{delete} = [ qw(target where returning) ];
$self->{expand}{delete} = sub { shift->_expand_statement(@_) };
- $self->{render}{delete} = sub { shift->_render_statement(delete => @_) };
+ $self->{render}{delete} = sub { shift->_render_statement(@_) };
$self->{expand_clause}{"delete.$_"} = "_expand_delete_clause_$_"
for @{$self->{clauses_of}{delete}};
$self->{expand_clause}{"delete.from"} = '_expand_delete_clause_target';
'target', 'fields', 'from', 'returning'
];
$self->{expand}{insert} = sub { shift->_expand_statement(@_) };
- $self->{render}{insert} = sub { shift->_render_statement(insert => @_) };
+ $self->{render}{insert} = sub { shift->_render_statement(@_) };
$self->{expand_clause}{'insert.into'} = '_expand_insert_clause_target';
$self->{expand_clause}{'insert.target'} = '_expand_insert_clause_target';
$self->{expand_clause}{'insert.fields'} = sub {
sub _expand_statement {
my ($self, $type, $args) = @_;
my $ec = $self->{expand_clause};
+ if ($args->{_}) {
+ $args = { %$args };
+ $args->{$type} = delete $args->{_}
+ }
return +{ "-${type}" => +{
map {
my $val = $args->{$_};
next unless defined($sql) and length($sql);
push @parts, \@part;
}
- my ($sql, @bind) = $self->_join_parts(' ', @parts);
+ my ($sql, @bind) = $self->join_clauses(' ', @parts);
return (
(our $Render_Top_Level ? $sql : '('.$sql.')'),
@bind
}
sub _render_values {
- my ($self, $values) = @_;
- my ($v_sql, @bind) = $self->_join_parts(
+ my ($self, undef, $values) = @_;
+ my ($v_sql, @bind) = $self->join_clauses(
', ',
map [ $self->render_aqt($_) ],
ref($values) eq 'ARRAY' ? @$values : $values
sub _ext_rw {
my ($self, $name, $key, $value) = @_;
- return $self->{$name}{$key} unless @_ > 2;
+ return $self->{$name}{$key} unless @_ > 3;
$self->{$name}{$key} = $value;
return $self;
}
BEGIN {
foreach my $type (qw(
- expand op_expand render op_renderer clause_expand clause_render
+ expand op_expand render op_render clause_expand clause_render
)) {
my $key = join '_', reverse split '_', $type;
my $singular = "${type}er";
unless (@clauses) {
return @{$self->{clauses_of}{$of}||[]};
}
+ if (ref($clauses[0]) eq 'CODE') {
+ @clauses = $self->${\($clauses[0])}(@{$self->{clauses_of}{$of}||[]});
+ }
$self->{clauses_of}{$of} = \@clauses;
return $self;
}