X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract.pm;h=59ea97d0e4ca1bba0e730b3c19307063dddc310d;hb=0236f122f73090f9773bae7a6941a286c86ff889;hp=6ee5a5f90afd9502dff46504e48307e00f06d5a2;hpb=fe8b493f5d24be683bf3e3ddf2fb933ae8d193e6;p=scpubgit%2FQ-Branch.git

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index 6ee5a5f..59ea97d 100644
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -277,7 +277,7 @@ sub insert {
     push @parts, [ $self->_insert_returning($options) ];
   }
 
-  return $self->join_clauses(' ', @parts);
+  return $self->join_query_parts(' ', @parts);
 }
 
 sub _expand_insert_values {
@@ -1185,26 +1185,26 @@ sub _render_op_in {
 
 sub _render_op_andor {
   my ($self, $op, $args) = @_;
-  my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$args;
+  my @parts = map [ $self->render_aqt($_) ], @$args;
   return '' unless @parts;
   return @{$parts[0]} if @parts == 1;
-  my ($sql, @bind) = $self->join_clauses(' '.$self->_sqlcase($op).' ', @parts);
+  my ($sql, @bind) = $self->join_query_parts(' '.$self->_sqlcase($op).' ', @parts);
   return '( '.$sql.' )', @bind;
 }
 
 sub _render_op_multop {
   my ($self, $op, $args) = @_;
-  my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$args;
+  my @parts = map [ $self->render_aqt($_) ], @$args;
   return '' unless @parts;
   return @{$parts[0]} if @parts == 1;
   my $join = ($op eq ','
                 ? ', '
                 :  ' '.$self->_sqlcase(join ' ', split '_', $op).' '
              );
-  return $self->join_clauses($join, @parts);
+  return $self->join_query_parts($join, @parts);
 }
 
-sub join_clauses {
+sub join_query_parts {
   my ($self, $join, @parts) = @_;
   return (
     join($join, map $_->[0], @parts),