From: Matt S Trout <mst@shadowcat.co.uk>
Date: Sat, 12 Oct 2013 15:59:18 +0000 (+0000)
Subject: clean up OracleJoins
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ecc0feafab15b24834e9e8430754838624dd61c9;p=dbsrgits%2FDBIx-Class.git

clean up OracleJoins
---

diff --git a/lib/DBIx/Class/SQLMaker/Renderer/OracleJoins.pm b/lib/DBIx/Class/SQLMaker/Renderer/OracleJoins.pm
index 6dde061..f431b68 100644
--- a/lib/DBIx/Class/SQLMaker/Renderer/OracleJoins.pm
+++ b/lib/DBIx/Class/SQLMaker/Renderer/OracleJoins.pm
@@ -4,12 +4,9 @@ sub map_descending (&;@) {
   my ($block, $in) = @_;
   local $_ = $in;
   $_ = $block->($_) if ref($_) eq 'HASH';
-#::Dwarn([mapped => $_]);
   if (ref($_) eq 'REF' and ref($$_) eq 'HASH') {
     $$_;
   } elsif (ref($_) eq 'HASH') {
-#::Dwarn([unmapped => $_]);
-#::Dwarn([mapped => $mapped]);
     my $mapped = $_;
     local $_;
     +{ map +($_ => &map_descending($block, $mapped->{$_})), keys %$mapped };
@@ -34,8 +31,6 @@ around render => sub {
 sub _oracle_joins_unroll {
   my ($self, $dq) = @_;
   map_descending {
-#warn "here";
-#::Dwarn([unroll => $_]);
     return $_ unless is_Join;
     return \$self->_oracle_joins_mangle_join($_);
   } $dq;
@@ -46,7 +41,7 @@ sub _oracle_joins_mangle_join {
   my ($mangled, $where) = $self->_oracle_joins_recurse_join($dq);
   Where(
     (@$where > 1
-      ? Operator({ 'SQL.Naive' => 'and' }, $where)
+      ? Operator({ 'SQL.Naive' => 'AND' }, $where)
       : $where->[0]),
     $mangled
   );