use strict;
use warnings;
+use if $] < '5.010', 'MRO::Compat';
use mro 'c3';
use base 'SQL::Abstract';
$self->{render}{select} = sub { shift->_render_statement(select => @_) };
$self->{expand_clause}{"select.$_"} = "_expand_select_clause_$_"
for @{$self->{clauses_of}{select}};
- $self->{clauses_of}{update} = [ qw(update set where returning) ];
+ $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->{expand_clause}{"update.$_"} = "_expand_update_clause_$_"
for @{$self->{clauses_of}{update}};
- $self->{clauses_of}{delete} = [ qw(delete_from where returning) ];
+ $self->{expand_clause}{'update.update'} = '_expand_update_clause_target';
+ $self->{render_clause}{'update.target'} = sub {
+ my ($self, $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->{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 ($sql, @bind) = $self->render_aqt($from);
+ ($self->_sqlcase('delete from ').$sql, @bind);
+ };
$self->{clauses_of}{insert} = [
- 'insert_into', 'fields', 'values', 'returning'
+ 'target', 'fields', 'from', 'returning'
];
$self->{expand}{insert} = sub { shift->_expand_statement(@_) };
$self->{render}{insert} = sub { shift->_render_statement(insert => @_) };
- $self->{expand_clause}{'insert.insert_into'} = sub {
- shift->expand_expr(@_, -ident);
+ $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?
};
+ $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({ -row => [ $_[1] ] });
+ return $_[0]->render_aqt($_[1]);
+ };
+ $self->{render_clause}{'insert.target'} = sub {
+ my ($self, $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);
+ };
+ $self->{expand}{values} = '_expand_values';
+ $self->{render}{values} = '_render_values';
+ $self->{expand}{exists} = sub {
+ $_[0]->_expand_op(undef, [ exists => $_[2] ]);
};
return $self;
}
+(order_by => $self->_expand_order_by($order_by));
}
-sub _expand_update_clause_update {
+sub _expand_update_clause_target {
my ($self, $target) = @_;
- +(update => $self->expand_expr($target, -ident));
+ +(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(@_));
}
+(returning => shift->_expand_maybe_list_expr(@_, -ident));
}
-sub _expand_delete_clause_delete_from {
- +(delete_from => shift->_expand_maybe_list_expr(@_, -ident));
+sub _expand_delete_clause_target {
+ +(target => shift->_expand_maybe_list_expr(@_, -ident));
}
sub _expand_delete_clause_where { +(where => shift->expand_expr(@_)); }
@exp
}
} else {
- ($_ => $val)
+ ($_ => $self->expand_expr($val))
}
} sort keys %$args
} };
if (my $rdr = $self->{render_clause}{"${type}.${clause}"}) {
$self->$rdr($clause_expr);
} else {
- my ($clause_sql, @bind) = $self->render_aqt($clause_expr);
+ my ($clause_sql, @bind) = $self->render_aqt($clause_expr, 1);
my $sql = join ' ',
$self->_sqlcase(join ' ', split '_', $clause),
$clause_sql;
next unless defined($sql) and length($sql);
push @parts, \@part;
}
- return $self->_join_parts(' ', @parts);
+ my ($sql, @bind) = $self->_join_parts(' ', @parts);
+ return (
+ (our $Render_Top_Level ? $sql : '('.$sql.')'),
+ @bind
+ );
+}
+
+sub render_aqt {
+ my ($self, $aqt, $top_level) = @_;
+ local our $Render_Top_Level = $top_level;
+ return $self->next::method($aqt);
+}
+
+sub render_statement {
+ my ($self, $expr, $default_scalar_to) = @_;
+ my ($sql, @bind) = $self->render_aqt(
+ $self->expand_expr($expr, $default_scalar_to), 1
+ );
+ return (wantarray ? ($sql, @bind) : $sql);
}
sub select {
my ($self, @args) = @_;
+
+ return $self->render_statement({ -select => $_[1] }) if ref($_[1]) eq 'HASH';
+
my %clauses;
@clauses{qw(from select where order_by)} = @args;
$clauses{select} = { -literal => [ $clauses{select}||'*' ] }
unless ref($clauses{select});
- my ($sql, @bind) = $self->render_expr({ -select => \%clauses });
- return wantarray ? ($sql, @bind) : $sql;
+ return $self->render_statement({ -select => \%clauses });
}
sub update {
my ($self, $table, $set, $where, $options) = @_;
+
+ return $self->render_statement({ -update => $_[1] }) if ref($_[1]) eq 'HASH';
+
my %clauses;
- @clauses{qw(update set where)} = ($table, $set, $where);
+ @clauses{qw(target set where)} = ($table, $set, $where);
puke "Unsupported data type specified to \$sql->update"
unless ref($clauses{set}) eq 'HASH';
@clauses{keys %$options} = values %$options;
- my ($sql, @bind) = $self->render_expr({ -update => \%clauses });
- return wantarray ? ($sql, @bind) : $sql;
+ return $self->render_statement({ -update => \%clauses });
}
sub delete {
my ($self, $table, $where, $options) = @_;
- my %clauses = (delete_from => $table, where => $where, %{$options||{}});
- my ($sql, @bind) = $self->render_expr({ -delete => \%clauses });
- return wantarray ? ($sql, @bind) : $sql;
+
+ return $self->render_statement({ -delete => $_[1] }) if ref($_[1]) eq 'HASH';
+
+ my %clauses = (target => $table, where => $where, %{$options||{}});
+ return $self->render_statement({ -delete => \%clauses });
}
sub insert {
my ($self, $table, $data, $options) = @_;
- my %clauses = (insert_into => $table, %{$options||{}});
+
+ return $self->render_statement({ -insert => $_[1] }) if ref($_[1]) eq 'HASH';
+
+ my %clauses = (target => $table, values => $data, %{$options||{}});
+ return $self->render_statement({ -insert => \%clauses });
+}
+
+sub _expand_insert_clause_target {
+ +(target => shift->_expand_maybe_list_expr(@_, -ident));
+}
+
+sub _expand_insert_clause_values {
+ my ($self, $data) = @_;
+ if (ref($data) eq 'HASH' and (keys(%$data))[0] =~ /^-/) {
+ return $self->expand_expr($data);
+ }
+ return $data if ref($data) eq 'HASH' and $data->{-row};
my ($f_aqt, $v_aqt) = $self->_expand_insert_values($data);
- $clauses{fields} = $f_aqt if $f_aqt;
- $clauses{values} = $v_aqt;
- my ($sql, @bind) = $self->render_expr({ -insert => \%clauses });
- return wantarray ? ($sql, @bind) : $sql;
+ return (from => { -values => $v_aqt }, ($f_aqt ? (fields => $f_aqt) : ()));
+}
+
+sub _expand_values {
+ my ($self, undef, $values) = @_;
+ return { -values => [
+ map +(
+ ref($_) eq 'HASH'
+ ? $self->expand_expr($_)
+ : +{ -row => [ map $self->expand_expr($_), @$_ ] }
+ ), ref($values) eq 'ARRAY' ? @$values : $values
+ ] };
}
+sub _render_values {
+ my ($self, $values) = @_;
+ my ($v_sql, @bind) = $self->_join_parts(
+ ', ',
+ 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
+ );
+}
+
+sub _ext_rw {
+ my ($self, $name, $key, $value) = @_;
+ return $self->{$name}{$key} unless @_ > 2;
+ $self->{$name}{$key} = $value;
+ return $self;
+}
+
+BEGIN {
+ foreach my $type (qw(
+ expand op_expand render op_renderer 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;
+}
+
+sub clone {
+ my ($self) = @_;
+ bless(
+ {
+ (map +($_ => (
+ ref($self->{$_}) eq 'HASH'
+ ? { %{$self->{$_}} }
+ : $self->{$_}
+ )), keys %$self),
+ },
+ ref($self)
+ );
+}
+
+
1;
projects / scpubgit/Q-Branch.git / blobdiff