make join_query_parts handle scalars

[scpubgit/Q-Branch.git] / lib / SQL / Abstract.pm

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index 6e3327b..b658243 100644 (file)
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -1152,7 +1152,7 @@ sub _render_op_between {
   return $self->join_query_parts(' ',
     [ '(' ],
     $left,
-    [ $self->_sqlcase(join ' ', split '_', $op) ],
+    [ $self->format_keyword($op) ],
     @rh,
     [ ')' ],
   );
@@ -1199,8 +1199,11 @@ sub _render_op_multop {
 
 sub join_query_parts {
   my ($self, $join, @parts) = @_;
-  my @final = map +(ref($_) eq 'HASH' ? [ $self->render_aqt($_) ] : $_),
-                @parts;
+  my @final = map +(
+    ref($_) eq 'HASH'
+      ? [ $self->render_aqt($_) ]
+      : ref($_) eq 'ARRAY' ? $_ : [ $_ ]),
+         @parts;
   return (
     join($join, map $_->[0], @final),
     (wantarray ? (map @{$_}[1..$#$_], @final) : ()),