# NEW
#======================================================================
+our %Defaults = (
+ expand => {
+ not => '_expand_not',
+ bool => '_expand_bool',
+ and => '_expand_op_andor',
+ or => '_expand_op_andor',
+ nest => '_expand_nest',
+ bind => '_expand_bind',
+ in => '_expand_in',
+ not_in => '_expand_in',
+ row => '_expand_row',
+ between => '_expand_between',
+ not_between => '_expand_between',
+ op => '_expand_op',
+ (map +($_ => '_expand_op_is'), ('is', 'is_not')),
+ ident => '_expand_ident',
+ value => '_expand_value',
+ func => '_expand_func',
+ },
+ expand_op => {
+ 'between' => '_expand_between',
+ 'not_between' => '_expand_between',
+ 'in' => '_expand_in',
+ 'not_in' => '_expand_in',
+ 'nest' => '_expand_nest',
+ (map +($_ => '_expand_op_andor'), ('and', 'or')),
+ (map +($_ => '_expand_op_is'), ('is', 'is_not')),
+ 'ident' => '_expand_ident',
+ 'value' => '_expand_value',
+ },
+ render => {
+ (map +($_, "_render_$_"), qw(op func bind ident literal row)),
+ },
+ render_op => {
+ (map +($_ => '_render_op_between'), 'between', 'not_between'),
+ (map +($_ => '_render_op_in'), 'in', 'not_in'),
+ (map +($_ => '_render_unop_postfix'),
+ 'is_null', 'is_not_null', 'asc', 'desc',
+ ),
+ (not => '_render_unop_paren'),
+ (map +($_ => '_render_op_andor'), qw(and or)),
+ ',' => '_render_op_multop',
+ },
+ clauses_of => {
+ delete => [ qw(target where returning) ],
+ },
+ expand_clause => {
+ 'delete.target' => '_expand_delete_clause_target',
+ 'delete.from' => '_expand_delete_clause_target',
+ 'delete.where' => '_expand_delete_clause_where',
+ 'delete.returning' => '_expand_delete_clause_returning',
+ },
+ render_clause => {
+ 'delete.target' => '_render_delete_clause_target',
+ },
+);
+
+foreach my $stmt (keys %{$Defaults{clauses_of}}) {
+ $Defaults{expand}{$stmt} = '_expand_statement';
+ $Defaults{render}{$stmt} = '_render_statement';
+}
+
sub new {
my $self = shift;
my $class = ref($self) || $self;
$opt{expand_unary} = {};
- $opt{expand} = {
- not => '_expand_not',
- bool => '_expand_bool',
- and => '_expand_op_andor',
- or => '_expand_op_andor',
- nest => '_expand_nest',
- bind => '_expand_bind',
- in => '_expand_in',
- not_in => '_expand_in',
- row => '_expand_row',
- between => '_expand_between',
- not_between => '_expand_between',
- op => '_expand_op',
- (map +($_ => '_expand_op_is'), ('is', 'is_not')),
- ident => '_expand_ident',
- value => '_expand_value',
- func => '_expand_func',
- };
-
- $opt{expand_op} = {
- 'between' => '_expand_between',
- 'not_between' => '_expand_between',
- 'in' => '_expand_in',
- 'not_in' => '_expand_in',
- 'nest' => '_expand_nest',
- (map +($_ => '_expand_op_andor'), ('and', 'or')),
- (map +($_ => '_expand_op_is'), ('is', 'is_not')),
- 'ident' => '_expand_ident',
- 'value' => '_expand_value',
- };
-
- $opt{render} = {
- (map +($_, "_render_$_"), qw(op func bind ident literal row)),
- %{$opt{render}||{}}
- };
-
- $opt{render_op} = {
- (map +($_ => '_render_op_between'), 'between', 'not_between'),
- (map +($_ => '_render_op_in'), 'in', 'not_in'),
- (map +($_ => '_render_unop_postfix'),
- 'is_null', 'is_not_null', 'asc', 'desc',
- ),
- (not => '_render_unop_paren'),
- (map +($_ => '_render_op_andor'), qw(and or)),
- ',' => '_render_op_multop',
- };
+ foreach my $name (sort keys %Defaults) {
+ $opt{$name} = { %{$Defaults{$name}} };
+ }
if ($opt{lazy_join_sql_parts}) {
my $mod = Module::Runtime::use_module('SQL::Abstract::Parts');
# DELETE
#======================================================================
-
sub delete {
- my $self = shift;
- my $table = $self->_table(shift);
- my $where = shift;
- my $options = shift;
-
- my($where_sql, @bind) = $self->where($where);
- my $sql = $self->_sqlcase('delete from ') . $table . $where_sql;
+ my ($self, $table, $where, $options) = @_;
- if ($options->{returning}) {
- my ($returning_sql, @returning_bind) = $self->_delete_returning($options);
- $sql .= $returning_sql;
- push @bind, @returning_bind;
- }
-
- return wantarray ? ($sql, @bind) : $sql;
+ my $stmt = do {
+ if (ref($table) eq 'HASH') {
+ $table;
+ } else {
+ my %clauses = (target => $table, where => $where, %{$options||{}});
+ \%clauses;
+ }
+ };
+ my @rendered = $self->render_statement({ -delete => $stmt });
+ return wantarray ? @rendered : $rendered[0];
}
# So that subclasses can override DELETE ... RETURNING separately from
# INSERT and UPDATE
sub _delete_returning { shift->_returning(@_) }
+sub _expand_delete_clause_target {
+ +(target => $_[0]->_expand_maybe_list_expr($_[2], -ident));
+}
+sub _expand_delete_clause_where { +(where => $_[0]->expand_expr($_[2])); }
+
+sub _expand_delete_clause_returning {
+ +(returning => $_[0]->_expand_maybe_list_expr($_[2], -ident));
+}
+
+sub _render_delete_clause_target {
+ my ($self, undef, $from) = @_;
+ $self->join_query_parts(' ', $self->format_keyword('delete from'), $from);
+}
#======================================================================
# WHERE: entry point
}
sub render_aqt {
- my ($self, $aqt) = @_;
+ my ($self, $aqt, $top_level) = @_;
my ($k, $v, @rest) = %$aqt;
die "No" if @rest;
die "Not a node type: $k" unless $k =~ s/^-//;
if (my $meth = $self->{render}{$k}) {
+ local our $Render_Top_Level = $top_level;
return $self->$meth($k, $v);
}
die "notreached: $k";
) };
}
+sub render_statement {
+ my ($self, $expr, $default_scalar_to) = @_;
+ @{$self->render_aqt(
+ $self->expand_expr($expr, $default_scalar_to), 1
+ )};
+}
+
+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) {
+ ($_ => $exp[0])
+ } else {
+ @exp
+ }
+ } else {
+ ($_ => $self->expand_expr($val))
+ }
+ } sort keys %$args
+ } };
+}
+
+sub _render_statement {
+ my ($self, $type, $args) = @_;
+ my @parts;
+ foreach my $clause (@{$self->{clauses_of}{$type}}) {
+ next unless my $clause_expr = $args->{$clause};
+ my $part = do {
+ if (my $rdr = $self->{render_clause}{"${type}.${clause}"}) {
+ $self->$rdr($clause, $clause_expr);
+ } else {
+ my $r = $self->render_aqt($clause_expr, 1);
+ next unless defined $r->[0] and length $r->[0];
+ $self->join_query_parts(' ',
+ $self->format_keyword($clause),
+ $r
+ );
+ }
+ };
+ push @parts, $part;
+ }
+ my $q = $self->join_query_parts(' ', @parts);
+ return $self->join_query_parts('',
+ (our $Render_Top_Level ? $q : ('(', $q, ')'))
+ );
+}
+
sub _normalize_op {
my ($self, $raw) = @_;
my $op = lc $raw;
if ($k =~ /^-./) {
return $self->_expand_hashpair_op($k, $v);
} elsif ($k =~ /^[^\w]/i) {
- my ($lhs, @rhs) = @$v;
+ my ($lhs, @rhs) = ref($v) eq 'ARRAY' ? @$v : $v;
return $self->_expand_op(
-op, [ $k, $self->expand_expr($lhs, -ident), @rhs ]
);
my $op = $self->_normalize_op($k);
- if (my $exp = $self->{expand}{$op}) {
- return $self->$exp($op, $v);
- }
-
- # Ops prefixed with -not_ get converted
-
- if (my ($rest) = $op =~/^not_(.*)$/) {
- return +{ -op => [
- 'not',
- $self->_expand_expr({ "-${rest}", $v })
- ] };
- }
-
{ # Old SQLA compat
my $op = join(' ', split '_', $op);
) {
puke "Illegal use of top-level '-$op'"
}
+ }
+
+ if (my $exp = $self->{expand}{$op}) {
+ return $self->$exp($op, $v);
+ }
+
+ # Ops prefixed with -not_ get converted
+
+ if (my ($rest) = $op =~/^not_(.*)$/) {
+ return +{ -op => [
+ 'not',
+ $self->_expand_expr({ "-${rest}", $v })
+ ] };
+ }
+
+ { # Old SQLA compat
# the old unary op system means we should touch nothing and let it work
+ my $op = join(' ', split '_', $op);
+
if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) {
return { -op => [ $op, $v ] };
}
if (ref($vv) eq 'ARRAY') {
my @raw = @$vv;
my $logic = (defined($raw[0]) and $raw[0] =~ /^-(and|or)$/i)
- ? (shift(@raw), $1) : 'or';
+ ? (shift(@raw), lc $1) : 'or';
my @values = map +{ $vk => $_ }, @raw;
if (
$op =~ $self->{inequality_op}
projects / scpubgit/Q-Branch.git / blobdiff