$self->{expand_clause}{'update.update'} = '_expand_update_clause_target';
$self->{render_clause}{'update.target'} = sub {
my ($self, undef, $target) = @_;
- my ($sql, @bind) = $self->render_aqt($target);
- ($self->_sqlcase('update ').$sql, @bind);
+ $self->join_query_parts(' ', $self->format_keyword('update'), $target);
};
$self->{clauses_of}{delete} = [ qw(target where returning) ];
$self->{expand}{delete} = sub { shift->_expand_statement(@_) };
$self->{expand_clause}{"delete.from"} = '_expand_delete_clause_target';
$self->{render_clause}{'delete.target'} = sub {
my ($self, undef, $from) = @_;
- my ($sql, @bind) = $self->render_aqt($from);
- ($self->_sqlcase('delete from ').$sql, @bind);
+ $self->join_query_parts(' ', $self->format_keyword('delete from'), $from);
};
$self->{clauses_of}{insert} = [
'target', 'fields', 'from', 'returning'
};
$self->{render_clause}{'insert.target'} = sub {
my ($self, undef, $from) = @_;
- my ($sql, @bind) = $self->render_aqt($from);
- ($self->_sqlcase('insert into ').$sql, @bind);
+ $self->join_query_parts(' ', $self->format_keyword('insert into'), $from);
};
$self->{render_clause}{'insert.from'} = sub {
return $_[0]->render_aqt($_[2], 1);
$self->{expand}{exists} = sub {
$_[0]->_expand_op(undef, [ exists => $_[2] ]);
};
+ $self->{render}{convert_where} = sub {
+ my $self = shift;
+ local $self->{convert_where} = $self->{convert};
+ $self->render_aqt($_[1]);
+ };
return $self;
}
sub _expand_select_clause_where {
my ($self, undef, $where) = @_;
- +(where => $self->expand_expr($where));
+ my $exp = $self->expand_expr($where);
+ +(where => ($self->{convert} ? +{ -convert_where => $exp } : $exp));
}
sub _expand_select_clause_order_by {
my @parts;
foreach my $clause (@{$self->{clauses_of}{$type}}) {
next unless my $clause_expr = $args->{$clause};
- local $self->{convert_where} = $self->{convert} if $clause eq 'where';
- my ($sql) = my @part = do {
+ my @part = do {
if (my $rdr = $self->{render_clause}{"${type}.${clause}"}) {
$self->$rdr($clause, $clause_expr);
} else {
($sql, @bind);
}
};
- next unless defined($sql) and length($sql);
push @parts, \@part;
}
- my ($sql, @bind) = $self->join_clauses(' ', @parts);
+ my ($sql, @bind) = $self->join_query_parts(' ', @parts);
return (
(our $Render_Top_Level ? $sql : '('.$sql.')'),
@bind
sub _render_values {
my ($self, undef, $values) = @_;
- my ($v_sql, @bind) = $self->join_clauses(
- ', ',
- map [ $self->render_aqt($_) ],
- ref($values) eq 'ARRAY' ? @$values : $values
- );
- my $sql = $self->_sqlcase('values').' '.$v_sql;
- return (
- (our $Render_Top_Level ? $sql : '('.$sql.')'),
- @bind
+ my $inner = [
+ $self->join_query_parts(' ',
+ $self->format_keyword('values'),
+ [ $self->join_query_parts(', ',
+ ref($values) eq 'ARRAY' ? @$values : $values
+ ) ],
+ ),
+ ];
+ return $self->join_query_parts('',
+ (our $Render_Top_Level ? $inner : ('(', $inner, ')'))
);
}
foreach my $type (qw(
expand op_expand render op_render clause_expand clause_render
)) {
- my $key = join '_', reverse split '_', $type;
+ my $name = join '_', reverse split '_', $type;
my $singular = "${type}er";
- eval qq{sub ${singular} { shift->_ext_rw($key => \@_) }; 1 }
- or die "Method builder failed for ${type}er: $@";
+ eval qq{sub ${singular} { shift->_ext_rw($name => \@_) }; 1 }
+ or die "Method builder failed for ${singular}: $@";
+ eval qq{sub wrap_${singular} {
+ my (\$self, \$key, \$builder) = \@_;
+ my \$orig = \$self->_ext_rw('${name}', \$key);
+ \$self->_ext_rw(
+ '${name}', \$key,
+ \$builder->(\$orig, '${name}', \$key)
+ );
+ }; 1 } or die "Method builder failed for wrap_${singular}: $@";
eval qq{sub ${singular}s {
my (\$self, \@args) = \@_;
while (my (\$this_key, \$this_value) = splice(\@args, 0, 2)) {
- \$self->{${key}}{\$this_key} = \$this_value;
+ \$self->{${name}}{\$this_key} = \$this_value;
}
return \$self;
}; 1 } or die "Method builder failed for ${singular}s: $@";
+ eval qq{sub ${singular}_list { sort keys %{\$_[0]->{\$name}} }; 1; }
+ or die "Method builder failed for ${singular}_list: $@";
}
}
+sub statement_list { sort keys %{$_[0]->{clauses_of}} }
+
sub clauses_of {
my ($self, $of, @clauses) = @_;
unless (@clauses) {