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 ($sql, @bind) = $self->render_aqt($target);
- ($self->_sqlcase('update ').$sql, @bind);
+ my ($self, undef, $target) = @_;
+ $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->{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 ($sql, @bind) = $self->render_aqt($from);
- ($self->_sqlcase('delete from ').$sql, @bind);
+ my ($self, undef, $from) = @_;
+ $self->join_query_parts(' ', $self->format_keyword('delete from'), $from);
};
$self->{clauses_of}{insert} = [
'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.$_"} = "_expand_insert_clause_$_"
+ for @{$self->{clauses_of}{insert}};
$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->{expand_clause}{'insert.values'} = '_expand_insert_clause_from';
$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 ($sql, @bind) = $self->render_aqt($from);
- ($self->_sqlcase('insert into ').$sql, @bind);
+ my ($self, undef, $from) = @_;
+ $self->join_query_parts(' ', $self->format_keyword('insert into'), $from);
};
$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';
$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_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) = @_;
- +(where => $self->expand_expr($where));
+ my ($self, undef, $where) = @_;
+ my $exp = $self->expand_expr($where);
+ +(where => ($self->{convert} ? +{ -convert_where => $exp } : $exp));
}
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
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_expr);
+ $self->$rdr($clause, $clause_expr);
} else {
- my ($clause_sql, @bind) = $self->render_aqt($clause_expr, 1);
- my $sql = join ' ',
- $self->_sqlcase(join ' ', split '_', $clause),
- $clause_sql;
- ($sql, @bind);
+ $self->join_query_parts(' ',
+ $self->format_keyword($clause),
+ $self->render_aqt($clause_expr, 1)
+ );
}
};
- next unless defined($sql) and length($sql);
- push @parts, \@part;
+ push @parts, $part;
}
- my ($sql, @bind) = $self->join_clauses(' ', @parts);
- return (
+ my ($sql, @bind) = @{ $self->join_query_parts(' ', @parts) };
+ return [
(our $Render_Top_Level ? $sql : '('.$sql.')'),
@bind
- );
+ ];
}
sub render_aqt {
sub render_statement {
my ($self, $expr, $default_scalar_to) = @_;
- my ($sql, @bind) = $self->render_aqt(
+ $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 $stmt = do {
+ if (ref(my $sel = $args[0]) eq 'HASH') {
+ $sel
+ } else {
+ my %clauses;
+ @clauses{qw(from select where order_by)} = @args;
- my %clauses;
- @clauses{qw(from select where order_by)} = @args;
+ # This oddity is to literalify since historically SQLA doesn't quote
+ # a single identifier argument, so we convert it into a literal
- # This oddity is to literalify since historically SQLA doesn't quote
- # a single identifier argument, so we convert it into a literal
-
- $clauses{select} = { -literal => [ $clauses{select}||'*' ] }
- unless ref($clauses{select});
+ $clauses{select} = { -literal => [ $clauses{select}||'*' ] }
+ unless ref($clauses{select});
+ \%clauses;
+ }
+ };
- return $self->render_statement({ -select => \%clauses });
+ my $rendered = $self->render_statement({ -select => $stmt });
+ return wantarray ? @$rendered : $rendered->[0];
}
sub update {
my ($self, $table, $set, $where, $options) = @_;
- return $self->render_statement({ -update => $_[1] }) if ref($_[1]) eq 'HASH';
-
- my %clauses;
- @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;
- return $self->render_statement({ -update => \%clauses });
+ my $stmt = do {
+ if (ref($table) eq 'HASH') {
+ $table
+ } else {
+ my %clauses;
+ @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;
+ \%clauses;
+ }
+ };
+ my $rendered = $self->render_statement({ -update => $stmt });
+ return wantarray ? @$rendered : $rendered->[0];
}
sub delete {
my ($self, $table, $where, $options) = @_;
- return $self->render_statement({ -delete => $_[1] }) if ref($_[1]) eq 'HASH';
-
- my %clauses = (target => $table, where => $where, %{$options||{}});
- return $self->render_statement({ -delete => \%clauses });
+ 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];
}
sub insert {
my ($self, $table, $data, $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 });
+ my $stmt = do {
+ if (ref($table) eq 'HASH') {
+ $table;
+ } else {
+ my %clauses = (target => $table, values => $data, %{$options||{}});
+ \%clauses;
+ }
+ };
+ my $rendered = $self->render_statement({ -insert => $stmt });
+ return wantarray ? @$rendered : $rendered->[0];
}
sub _expand_insert_clause_target {
- +(target => shift->_expand_maybe_list_expr(@_, -ident));
+ +(target => $_[0]->_expand_maybe_list_expr($_[2], -ident));
+}
+
+sub _expand_insert_clause_fields {
+ return +{ -row => [
+ $_[0]->_expand_maybe_list_expr($_[2], -ident)
+ ] } if ref($_[2]) eq 'ARRAY';
+ return $_[2]; # should maybe still expand somewhat?
}
-sub _expand_insert_clause_values {
- my ($self, $data) = @_;
+sub _expand_insert_clause_from {
+ my ($self, undef, $data) = @_;
if (ref($data) eq 'HASH' and (keys(%$data))[0] =~ /^-/) {
return $self->expand_expr($data);
}
return (from => { -values => $v_aqt }, ($f_aqt ? (fields => $f_aqt) : ()));
}
+sub _expand_insert_clause_returning {
+ +(returning => $_[0]->_expand_maybe_list_expr($_[2], -ident));
+}
+
sub _expand_values {
my ($self, undef, $values) = @_;
return { -values => [
}
sub _render_values {
- my ($self, $values) = @_;
- my ($v_sql, @bind) = $self->join_clauses(
- ', ',
- map [ $self->render_aqt($_) ],
+ my ($self, undef, $values) = @_;
+ my $inner = $self->join_query_parts(' ',
+ $self->format_keyword('values'),
+ $self->join_query_parts(', ',
ref($values) eq 'ARRAY' ? @$values : $values
+ ),
);
- my $sql = $self->_sqlcase('values').' '.$v_sql;
- return (
- (our $Render_Top_Level ? $sql : '('.$sql.')'),
- @bind
+ 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) {
);
}
-
1;
projects / scpubgit/Q-Branch.git / blobdiff