From: Matt S Trout Date: Mon, 15 Apr 2019 02:14:51 +0000 (+0000) Subject: introduce keyword concept to avoid private methods X-Git-Tag: v2.000000~3^2~230 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=37b399a8225c9987c5a56532eaead321888695d0;p=dbsrgits%2FSQL-Abstract.git introduce keyword concept to avoid private methods --- diff --git a/lib/SQL/Abstract/ExtraClauses.pm b/lib/SQL/Abstract/ExtraClauses.pm index 00e4d2a..618356e 100644 --- a/lib/SQL/Abstract/ExtraClauses.pm +++ b/lib/SQL/Abstract/ExtraClauses.pm @@ -52,6 +52,10 @@ sub register_defaults { +(from => $_[0]->expand_expr({ -select => $_[1] })); }, ); + + $self->renderer(keyword => sub { + $_[0]->_sqlcase(join ' ', split '_', $_[1]); + }); return $self; } @@ -117,23 +121,18 @@ sub _render_join { my @parts = ( [ $self->render_aqt($args->{from}) ], - [ $self->_sqlcase( - ($args->{type} - ? join(' ', split '_', $args->{type}).' ' - : '' - ) - .'join' - ) - ], + [ $self->render_aqt( + { -keyword => join '_', ($args->{type}||()), 'join' } + ) ], [ $self->render_aqt( map +($_->{-ident} || $_->{-as} ? $_ : { -row => [ $_ ] }), $args->{to} ) ], ($args->{on} ? ( - [ $self->_sqlcase('on') ], + [ $self->render_aqt({ -keyword => 'on' }) ], [ $self->render_aqt($args->{on}) ], ) : ()), ($args->{using} ? ( - [ $self->_sqlcase('using') ], + [ $self->render_aqt({ -keyword => 'using' }) ], [ $self->render_aqt($args->{using}) ], ) : ()), ); @@ -153,7 +152,7 @@ sub _render_as { return $self->_join_parts( ' ', [ $self->render_aqt($thing) ], - [ $self->_sqlcase('as') ], + [ $self->render_aqt({ -keyword => 'as' }) ], (@cols ? [ $self->_join_parts('', [ $self->render_aqt($as) ],