parens around BETWEEN

[dbsrgits/Data-Query.git] / lib / Data / Query / Renderer / SQL / Naive.pm

diff --git a/lib/Data/Query/Renderer/SQL/Naive.pm b/lib/Data/Query/Renderer/SQL/Naive.pm
index 0b168a3..1049b46 100644 (file)
--- a/lib/Data/Query/Renderer/SQL/Naive.pm
+++ b/lib/Data/Query/Renderer/SQL/Naive.pm
@@ -3,7 +3,7 @@ package Data::Query::Renderer::SQL::Naive;
 use strictures 1;
 use SQL::ReservedWords;
 use Data::Query::Constants qw(
-  DQ_IDENTIFIER DQ_OPERATOR DQ_VALUE DQ_JOIN DQ_ALIAS DQ_ORDER
+  DQ_IDENTIFIER DQ_OPERATOR DQ_VALUE DQ_JOIN DQ_ALIAS DQ_ORDER DQ_LITERAL
 );
 
 sub new {
@@ -61,12 +61,16 @@ sub _flatten_structure {
   ];
 }
 
-# I present this to permit strange people to easily supply a patch to lc()
+# I presented this to permit strange people to easily supply a patch to lc()
 # their keywords, as I have heard many desire to do, lest they infect me
 # with whatever malady caused this desire by their continued proximity for
 # want of such a feature.
+#
+# Then I realised that SQL::Abstract compatibility work required it.
+#
+# FEH.
 
-sub _format_keyword { $_[1] }
+sub _format_keyword { $_[0]->{lc_keywords} ? lc($_[1]) : $_[1] }
 
 sub _render {
   $_[0]->${\"_render_${\(lc($_[1]->{type})||'broken')}"}($_[1]);
@@ -203,8 +207,16 @@ sub _handle_op_type_in {
 
 sub _handle_op_type_between {
   my ($self, $op_name, $dq) = @_;
-  my ($lhs, $rhs1, $rhs2) = (map $self->_render($_), @{$dq->{args}});
-  [ $lhs, $op_name, $rhs1, 'AND', $rhs2 ];
+  my @args = @{$dq->{args}};
+  if (@args == 3) {
+    my ($lhs, $rhs1, $rhs2) = (map $self->_render($_), @args);
+    [ '(', $lhs, $op_name, $rhs1, 'AND', $rhs2, ')' ];
+  } elsif (@args == 2 and $args[1]->{type} eq DQ_LITERAL) {
+    my ($lhs, $rhs) = (map $self->_render($_), @args);
+    [ '(', $lhs, $op_name, $rhs, ')' ];
+  } else {
+    die "Invalid args for between: ${\scalar @args} given";
+  }
 }
 
 sub _handle_op_type_apply {
@@ -294,9 +306,15 @@ sub _render_literal {
   unless ($dq->{subtype} eq 'SQL') {
     die "Can't render non-SQL literal";
   }
-  return [
-    $dq->{literal}, @{$dq->{values}||[]}
-  ];
+  if ($dq->{literal}) {
+    return [
+      $dq->{literal}, @{$dq->{values}||[]}
+    ];
+  } elsif ($dq->{parts}) {
+    return [ map $self->_render($_), @{$dq->{parts}} ];
+  } else {
+    die "Invalid SQL literal - neither 'literal' nor 'parts' found";
+  }
 }
 
 sub _render_join {