}
method _select(HashAST $ast) {
-
+ # Default to requiring columns and from
+ # Once TCs give better errors, make this a SelectAST type
+ for (qw/columns from/) {
+ confess "$_ key is required (and must be an AST) to select"
+ unless is_ArrayAST($ast->{$_});
+ }
+
+ # Check that columns is a -list
+ confess "columns key should be a -list AST, not " . $ast->{columns}[0]
+ unless $ast->{columns}[0] eq '-list';
+
+ my @output = (
+ "SELECT",
+ $self->dispatch($ast->{columns}),
+ "FROM",
+ $self->dispatch($ast->{from})
+ );
+
+ for (qw/join/) {
+ if (exists $ast->{$_}) {
+ my $sub_ast = $ast->{$_};
+ $sub_ast->{-type} = "$_" if is_HashRef($sub_ast);
+ confess "$_ option is not an AST"
+ unless is_AST($sub_ast);
+
+ push @output, $self->dispatch($sub_ast);
+ }
+ }
+
+ return join(' ', @output);
}
method _where(ArrayAST $ast) {
return 'WHERE ' . $self->_recurse_where(\@clauses);
}
- method _order_by(ArrayAST $ast) {
- my (undef, @clauses) = @$ast;
-
+ method _order_by(AST $ast) {
+ my @clauses = @{$ast->{order_by}};
+
my @output;
for (@clauses) {
- if ($_->[0] =~ /^-(asc|desc)$/) {
+ if (is_ArrayRef($_) && $_->[0] =~ /^-(asc|desc)$/) {
my $o = $1;
push @output, $self->dispatch($_->[1]) . " " . uc($o);
next;
return "ORDER BY " . join(", ", @output);
}
- method _name(ArrayAST $ast) {
- my (undef, @names) = @$ast;
+ method _name(AST $ast) {
+ my @names = @{$ast->{args}};
my $sep = $self->name_separator;
+ my $quote = $self->is_quoting
+ ? $self->quote_chars
+ : [ '' ];
- return $sep->[0] .
- join( $sep->[1] . $sep->[0], @names ) .
- $sep->[1]
- if (@$sep > 1);
+ my $join = $quote->[-1] . $sep . $quote->[0];
- return join($sep->[0], @names);
+ # We dont want to quote * in [qw/me */]: `me`.* is the desired output there
+ # This means you can't have a field called `*`. I am willing to accept this
+ # situation, cos thats a really stupid thing to want.
+ my $post;
+ $post = pop @names if $names[-1] eq '*';
+
+ my $ret =
+ $quote->[0] .
+ join( $join, @names ) .
+ $quote->[-1];
+
+ $ret .= $sep . $post if defined $post;
+ return $ret;
}
- method _join(HashAST $ast) {
+ method _join(HashRef $ast) {
my $output = 'JOIN ' . $self->dispatch($ast->{tablespec});
}
- method _list(ArrayAST $ast) {
- my (undef, @items) = @$ast;
+ method _list(AST $ast) {
+ my @items = @{$ast->{args}};
return join(
$self->list_separator,
map { $self->dispatch($_) } @items);
}
- method _alias(ArrayAST $ast) {
- my (undef, $alias, $as) = @$ast;
-
- return $self->dispatch($alias) . " AS $as";
+ method _alias(AST $ast) {
+
+ # TODO: Maybe we want qq{ AS "$as"} here
+ return $self->dispatch($ast->{ident}) . " AS " . $ast->{as};
}
$prio = $SQL::Abstract::PRIO{$1};
shift @$clauses;
} else {
+ # If first is not a ref, and its not -and or -or, then $clauses
+ # contains just a single clause
$clauses = [ $clauses ];
}
}