Merge 65d2014 into 4805666

dbsrgits · Aug 29, 2018 · 68a1d01 · 68a1d01
2 parents 4805666 + 65d2014
commit 68a1d01
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
@@ -1484,13 +1484,14 @@ sub _assert_bindval_matches_bindtype {
 sub _join_sql_clauses {
   my ($self, $logic, $clauses_aref, $bind_aref) = @_;
 
-  if (@$clauses_aref > 1) {
+  my @clauses_aref = grep {$_} @$clauses_aref;
+  if (@clauses_aref > 1) {
     my $join  = " " . $self->_sqlcase($logic) . " ";
-    my $sql = '( ' . join($join, @$clauses_aref) . ' )';
+    my $sql = '( ' . join($join, @clauses_aref) . ' )';
     return ($sql, @$bind_aref);
   }
-  elsif (@$clauses_aref) {
-    return ($clauses_aref->[0], @$bind_aref); # no parentheses
+  elsif (@clauses_aref) {
+    return ($clauses_aref[0], @$bind_aref); # no parentheses
   }
   else {
     return (); # if no SQL, ignore @$bind_aref