X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FQ-Branch.git;a=blobdiff_plain;f=lib%2FSQL%2FAbstract%2FExtraClauses.pm;h=0ab5a9c0bc076685f8e0f51e4423f4613e6e097d;hp=98789417de17ae61588a8151c1c7d3cb02412814;hb=a1f8b6efc03e9f71c39835fe9ae083fc3e386904;hpb=38c5397d5e9cb9be87c07cae532afef6437cf4eb diff --git a/lib/SQL/Abstract/ExtraClauses.pm b/lib/SQL/Abstract/ExtraClauses.pm index 9878941..0ab5a9c 100644 --- a/lib/SQL/Abstract/ExtraClauses.pm +++ b/lib/SQL/Abstract/ExtraClauses.pm @@ -94,7 +94,7 @@ sub register_defaults { my ($self, $setop, $args) = @_; $self->join_query_parts( ' '.$self->format_keyword(join '_', $setop, ($args->{type}||())).' ', - map [ $self->render_aqt($_) ], @{$args->{queries}} + @{$args->{queries}} ); }) for qw(union intersect except); @@ -146,7 +146,7 @@ sub register_defaults { [ $self->join_query_parts(' ', [ $self->_render_alias($alias) ], [ $self->format_keyword('as') ], - [ $self->render_aqt($query) ], + $query, ) ] } @{$with->{queries}} ) ]; @@ -215,7 +215,7 @@ sub _expand_join { sub _render_from_list { my ($self, undef, $list) = @_; - return $self->join_query_parts(', ', map [ $self->render_aqt($_) ], @$list); + return $self->join_query_parts(', ', @$list); } sub _render_join { @@ -262,11 +262,11 @@ sub _render_alias { my ($as, @cols) = @$args; return (@cols ? $self->join_query_parts('', - [ $self->render_aqt($as) ], + $as, [ '(' ], [ $self->join_query_parts( ', ', - map [ $self->render_aqt($_) ], @cols + @cols ) ], [ ')' ], )