];
$self->{expand}{insert} = sub { shift->_expand_statement(@_) };
$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($_[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->{expand_clause}{'insert.values'} = '_expand_insert_clause_from';
$self->{render_clause}{'insert.fields'} = sub {
return $_[0]->render_aqt($_[2]);
};
$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]);
- };
+
+ # check for overriden methods
+ if ($self->can('_table') ne SQL::Abstract->can('_table')) {
+ $self->{expand_clause}{'select.from'} = sub {
+ return +{ -literal => [ $_[0]->_table($_[2]) ] };
+ };
+ }
+ if ($self->can('_order_by') ne SQL::Abstract->can('_order_by')) {
+ $self->{expand_clause}{'select.order_by'} = sub {
+ my ($osql, @obind) = $_[0]->_order_by($_[2]);
+ $osql =~ s/^order by //i;
+ return undef unless length($osql);
+ return +{ -literal => [ $osql, @obind ] };
+ };
+ }
return $self;
}
sub _expand_select_clause_where {
my ($self, undef, $where) = @_;
- my $exp = $self->expand_expr($where);
- +(where => ($self->{convert} ? +{ -convert_where => $exp } : $exp));
+
+ my $sqla = do {
+ if (my $conv = $self->{convert}) {
+ my $_wrap = sub {
+ my $orig = shift;
+ sub {
+ my $self = shift;
+ +{ -func => [
+ $conv,
+ $self->$orig(@_)
+ ] };
+ };
+ };
+ $self->clone
+ ->wrap_expanders(map +($_ => $_wrap), qw(ident value bind))
+ ->wrap_op_expanders(map +($_ => $_wrap), qw(ident value bind))
+ ->wrap_expander(func => sub {
+ my $orig = shift;
+ sub {
+ my ($self, $type, $thing) = @_;
+ if (ref($thing) eq 'ARRAY' and $thing->[0] eq $conv
+ and @$thing == 2 and ref($thing->[1]) eq 'HASH'
+ and (
+ $thing->[1]{-ident}
+ or $thing->[1]{-value}
+ or $thing->[1]{-bind})
+ ) {
+ return { -func => $thing }; # already went through our expander
+ }
+ return $self->$orig($type, $thing);
+ }
+ });
+ } else {
+ $self;
+ }
+ };
+
+ return +(where => $sqla->expand_expr($where));
}
sub _expand_select_clause_order_by {
my @parts;
foreach my $clause (@{$self->{clauses_of}{$type}}) {
next unless my $clause_expr = $args->{$clause};
- my @part = do {
+ my $part = do {
if (my $rdr = $self->{render_clause}{"${type}.${clause}"}) {
$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)
+ );
}
};
- push @parts, \@part;
+ push @parts, $part;
}
- my ($sql, @bind) = $self->join_query_parts(' ', @parts);
- return (
- (our $Render_Top_Level ? $sql : '('.$sql.')'),
- @bind
+ my $q = $self->join_query_parts(' ', @parts);
+ return $self->join_query_parts('',
+ (our $Render_Top_Level ? $q : ('(', $q, ')'))
);
}
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) = @_;
+ my $stmt = do {
+ if (ref(my $sel = $args[0]) eq 'HASH') {
+ $sel
+ } else {
+ 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
+
+ $clauses{select} = { -literal => [ $clauses{select}||'*' ] }
+ unless ref($clauses{select});
+ \%clauses;
+ }
+ };
- return $self->render_statement({ -select => $_[1] }) if ref($_[1]) eq 'HASH';
-
- 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
-
- $clauses{select} = { -literal => [ $clauses{select}||'*' ] }
- unless ref($clauses{select});
-
- 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 => $_[0]->_expand_maybe_list_expr($_[2], -ident));
}
-sub _expand_insert_clause_values {
+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_from {
my ($self, undef, $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);
- return (from => { -values => $v_aqt }, ($f_aqt ? (fields => $f_aqt) : ()));
+ 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 {
sub _render_values {
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 $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, ')'))
);
eval qq{sub ${singular}s {
my (\$self, \@args) = \@_;
while (my (\$this_key, \$this_value) = splice(\@args, 0, 2)) {
- \$self->{${name}}{\$this_key} = \$this_value;
+ \$self->_ext_rw('${name}', \$this_key, \$this_value);
}
return \$self;
}; 1 } or die "Method builder failed for ${singular}s: $@";
+ eval qq{sub wrap_${singular}s {
+ my (\$self, \@args) = \@_;
+ while (my (\$this_key, \$this_builder) = splice(\@args, 0, 2)) {
+ my \$orig = \$self->_ext_rw('${name}', \$this_key);
+ \$self->_ext_rw(
+ '${name}', \$this_key,
+ \$this_builder->(\$orig, '${name}', \$this_key),
+ );
+ }
+ return \$self;
+ }; 1 } or die "Method builder failed for wrap_${singular}s: $@";
eval qq{sub ${singular}_list { sort keys %{\$_[0]->{\$name}} }; 1; }
or die "Method builder failed for ${singular}_list: $@";
}
}
+sub register_op { $_[0]->{is_op}{$_[1]} = 1; $_[0] }
+
sub statement_list { sort keys %{$_[0]->{clauses_of}} }
sub clauses_of {
projects / scpubgit/Q-Branch.git / blobdiff