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->{render_clause}{'update.target'} = sub {
- my ($self, $target) = @_;
+ my ($self, undef, $target) = @_;
my ($sql, @bind) = $self->render_aqt($target);
($self->_sqlcase('update ').$sql, @bind);
};
$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';
$self->{render_clause}{'delete.target'} = sub {
- my ($self, $from) = @_;
+ my ($self, undef, $from) = @_;
my ($sql, @bind) = $self->render_aqt($from);
($self->_sqlcase('delete from ').$sql, @bind);
};
'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 {
return +{ -row => [
- shift->_expand_maybe_list_expr(@_, -ident)
- ] } if ref($_[1]) eq 'ARRAY';
- return $_[1]; # should maybe still expand somewhat?
+ shift->_expand_maybe_list_expr($_[2], -ident)
+ ] } if ref($_[2]) eq 'ARRAY';
+ return $_[2]; # should maybe still expand somewhat?
};
$self->{expand_clause}{'insert.values'} = '_expand_insert_clause_values';
$self->{expand_clause}{'insert.returning'} = sub {
shift->_expand_maybe_list_expr(@_, -ident);
};
$self->{render_clause}{'insert.fields'} = sub {
- return $_[0]->render_aqt($_[1]);
+ return $_[0]->render_aqt($_[2]);
};
$self->{render_clause}{'insert.target'} = sub {
- my ($self, $from) = @_;
+ my ($self, undef, $from) = @_;
my ($sql, @bind) = $self->render_aqt($from);
($self->_sqlcase('insert into ').$sql, @bind);
};
$self->{render_clause}{'insert.from'} = sub {
- return $_[0]->render_aqt($_[1], 1);
+ return $_[0]->render_aqt($_[2], 1);
};
$self->{expand}{values} = '_expand_values';
$self->{render}{values} = '_render_values';
}
sub _expand_select_clause_select {
- my ($self, $select) = @_;
+ my ($self, undef, $select) = @_;
+(select => $self->_expand_maybe_list_expr($select, -ident));
}
sub _expand_select_clause_from {
- my ($self, $from) = @_;
+ my ($self, undef, $from) = @_;
+(from => $self->_expand_maybe_list_expr($from, -ident));
}
sub _expand_select_clause_where {
- my ($self, $where) = @_;
+ my ($self, undef, $where) = @_;
+(where => $self->expand_expr($where));
}
sub _expand_select_clause_order_by {
- my ($self, $order_by) = @_;
+ my ($self, undef, $order_by) = @_;
+(order_by => $self->_expand_order_by($order_by));
}
sub _expand_update_clause_target {
- my ($self, $target) = @_;
+ my ($self, undef, $target) = @_;
+(target => $self->_expand_maybe_list_expr($target, -ident));
}
sub _expand_update_clause_set {
- return $_[1] if ref($_[1]) eq 'HASH' and ($_[1]->{-op}||[''])->[0] eq ',';
- +(set => shift->_expand_update_set_values(@_));
+ return $_[2] if ref($_[2]) eq 'HASH' and ($_[2]->{-op}||[''])->[0] eq ',';
+ +(set => $_[0]->_expand_update_set_values($_[1], $_[2]));
}
sub _expand_update_clause_where {
- +(where => shift->expand_expr(@_));
+ +(where => $_[0]->expand_expr($_[2]));
}
sub _expand_update_clause_returning {
- +(returning => shift->_expand_maybe_list_expr(@_, -ident));
+ +(returning => $_[0]->_expand_maybe_list_expr($_[2], -ident));
}
sub _expand_delete_clause_target {
- +(target => shift->_expand_maybe_list_expr(@_, -ident));
+ +(target => $_[0]->_expand_maybe_list_expr($_[2], -ident));
}
-sub _expand_delete_clause_where { +(where => shift->expand_expr(@_)); }
+sub _expand_delete_clause_where { +(where => $_[0]->expand_expr($_[2])); }
sub _expand_delete_clause_returning {
- +(returning => shift->_expand_maybe_list_expr(@_, -ident));
+ +(returning => $_[0]->_expand_maybe_list_expr($_[2], -ident));
}
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->{$_};
if (defined($val) and my $exp = $ec->{"${type}.$_"}) {
- if ((my (@exp) = $self->$exp($val)) == 1) {
+ if ((my (@exp) = $self->$exp($_ => $val)) == 1) {
($_ => $exp[0])
} else {
@exp
local $self->{convert_where} = $self->{convert} if $clause eq 'where';
my ($sql) = my @part = do {
if (my $rdr = $self->{render_clause}{"${type}.${clause}"}) {
- $self->$rdr($clause_expr);
+ $self->$rdr($clause, $clause_expr);
} else {
my ($clause_sql, @bind) = $self->render_aqt($clause_expr, 1);
my $sql = join ' ',
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 _expand_insert_clause_target {
- +(target => shift->_expand_maybe_list_expr(@_, -ident));
+ +(target => $_[0]->_expand_maybe_list_expr($_[2], -ident));
}
sub _expand_insert_clause_values {
- my ($self, $data) = @_;
+ my ($self, undef, $data) = @_;
if (ref($data) eq 'HASH' and (keys(%$data))[0] =~ /^-/) {
return $self->expand_expr($data);
}
}
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;
}
-sub expander { shift->_ext_rw(expand => @_) }
-sub op_expander { shift->_ext_rw(expand_op => @_) }
-sub renderer { shift->_ext_rw(render => @_) }
-sub op_renderer { shift->_ext_rw(expand_op => @_) }
-sub clause_expander { shift->_ext_rw(expand_cluse => @_) }
-sub clause_renderer { shift->_ext_rw(render_clause => @_) }
+BEGIN {
+ foreach my $type (qw(
+ expand op_expand render op_render clause_expand clause_render
+ )) {
+ my $key = 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}s {
+ my (\$self, \@args) = \@_;
+ while (my (\$this_key, \$this_value) = splice(\@args, 0, 2)) {
+ \$self->{${key}}{\$this_key} = \$this_value;
+ }
+ return \$self;
+ }; 1 } or die "Method builder failed for ${singular}s: $@";
+ }
+}
sub clauses_of {
my ($self, $of, @clauses) = @_;
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;
}
);
}
-
1;