fixed incorrect is_Literal usage

[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 3fa8811..07a9d50 100644 (file)
--- a/lib/Data/Query/Renderer/SQL/Naive.pm
+++ b/lib/Data/Query/Renderer/SQL/Naive.pm
@@ -5,10 +5,7 @@ use strictures 1;
 sub intersperse { my $i = shift; my @i = map +($_, $i), @_; pop @i; @i }
 
 use SQL::ReservedWords;
-use Data::Query::Constants qw(
-  DQ_IDENTIFIER DQ_OPERATOR DQ_VALUE DQ_JOIN DQ_ALIAS DQ_ORDER DQ_LITERAL
-  DQ_GROUP DQ_SELECT DQ_SLICE
-);
+use Data::Query::ExprHelpers;
 
 use Moo;
 
@@ -82,6 +79,9 @@ sub _flatten_structure {
 sub _format_keyword { $_[0]->lc_keywords ? lc($_[1]) : $_[1] }
 
 sub _render {
+  unless (ref($_[1]) eq 'HASH') {
+    die "Expected hashref, got ".(defined($_[1])?$_[1]:'undef');
+  }
   $_[0]->${\"_render_${\(lc($_[1]->{type})||'broken')}"}($_[1]);
 }
 
@@ -143,11 +143,11 @@ sub _render_operator {
 
 sub _maybe_parenthesise {
   my ($self, $dq) = @_;
-  my %parenthesise = map +($_ => 1), DQ_SELECT, DQ_SLICE;
-  return
-    ($parenthesise{$dq->{type}}
+  for ($dq) {
+    return is_Select() || is_Group() || is_Slice() || is_Having()
       ? [ '(', $self->_render($dq), ')' ]
-      : $self->_render($dq));
+      : $self->_render($dq);
+  }
 }
 
 sub _handle_op_type_binop {
@@ -192,7 +192,7 @@ sub _handle_op_type_flatten {
   my @arg_final;
   while (my $arg = shift @argq) {
 
-    unless ($arg->{type} eq DQ_OPERATOR) {
+    unless (is_Operator($arg)) {
       push @arg_final, $arg;
       next;
     }
@@ -234,7 +234,7 @@ sub _handle_op_type_between {
   if (@args == 3) {
     my ($lhs, $rhs1, $rhs2) = (map $self->_maybe_parenthesise($_), @args);
     [ '(', $lhs, $op_name, $rhs1, 'AND', $rhs2, ')' ];
-  } elsif (@args == 2 and $args[1]->{type} eq DQ_LITERAL) {
+  } elsif (@args == 2 and is_Literal $args[1]) {
     my ($lhs, $rhs) = (map $self->_render($_), @args);
     [ '(', $lhs, $op_name, $rhs, ')' ];
   } else {
@@ -246,7 +246,7 @@ sub _handle_op_type_apply {
   my ($self, $op_name, $dq) = @_;
   my ($func, @args) = @{$dq->{args}};
   die "Function name must be identifier"
-    unless $func->{type} eq DQ_IDENTIFIER;
+    unless is_Identifier $func;
   my $ident = do {
     # The problem we have here is that built-ins can't be quoted, generally.
     # I rather wonder if things like MAX(...) need to -not- be handled as
@@ -283,7 +283,7 @@ sub _render_select {
   # to project from since many databases handle 'SELECT 1;' fine
 
   my @select = intersperse(',',
-    map +($_->{type} eq DQ_ALIAS
+    map +(is_Alias()
            ? $self->_render_alias($_, $self->_format_keyword('AS'))
            : $self->_render($_)), @{$dq->{select}}
   );
@@ -305,16 +305,15 @@ sub _render_alias {
   # FROM foo foo -> FROM foo
   # FROM foo.bar bar -> FROM foo.bar
   if ($self->collapse_aliases) {
-    if ($dq->{from}{type} eq DQ_IDENTIFIER) {
-      if ($dq->{from}{elements}[-1] eq $dq->{to}) {
-        return $self->_render($dq->{from});
+    if (is_Identifier(my $from = $dq->{from})) {
+      if ($from->{elements}[-1] eq $dq->{to}) {
+        return $self->_render($from);
       }
     }
   }
-  my %parenthesise = map +($_ => 1), DQ_SELECT, DQ_SLICE;
-  return [ # XXX not sure this is the right place to detect this
+  return [
     $self->_maybe_parenthesise($dq->{from}),
-    $as || ' ',
+    $as || '',
     $self->_render_identifier({ elements => [ $dq->{to} ] })
   ];
 }
@@ -350,7 +349,7 @@ sub _render_join {
   my $rhs = $self->_render($right);
   [
     $self->_render($left), $join,
-    ($right->{type} eq DQ_JOIN ? ('(', $rhs, ')') : $rhs),
+    (is_Join($right) ? ('(', $rhs, ')') : $rhs),
     ($dq->{on}
       ? ($self->_format_keyword('ON'), $self->_render($dq->{on}))
       : ())
@@ -360,7 +359,7 @@ sub _render_join {
 sub _render_where {
   my ($self, $dq) = @_;
   my ($from, $where) = @{$dq}{qw(from where)};
-  my $keyword = ($from && $from->{type} eq DQ_GROUP) ? 'HAVING' : 'WHERE';
+  my $keyword = (is_Group($from) ? 'HAVING' : 'WHERE');
   [
     ($from ? $self->_render($from) : ()),
     $self->_format_keyword($keyword),
@@ -379,7 +378,7 @@ sub _render_order {
   );
   my $from;
   while ($from = $dq->{from}) {
-    last unless $from->{type} eq DQ_ORDER;
+    last unless is_Order $from;
     $dq = $from;
     push @ret, (
       ',',