handle convert where using expander wrapping

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

diff --git a/lib/SQL/Abstract/Clauses.pm b/lib/SQL/Abstract/Clauses.pm
index c790b38..b859342 100644 (file)
--- a/lib/SQL/Abstract/Clauses.pm
+++ b/lib/SQL/Abstract/Clauses.pm
@@ -63,11 +63,6 @@ sub register_defaults {
   $self->{expand}{exists} = sub {
     $_[0]->_expand_op(undef, [ exists => $_[2] ]);
   };
-  $self->{render}{convert_where} = sub {
-    my $self = shift;
-    local $self->{convert_where} = $self->{convert};
-    $self->render_aqt($_[1]);
-  };
   return $self;
 }
 
@@ -83,8 +78,41 @@ sub _expand_select_clause_from {
 
 sub _expand_select_clause_where {
   my ($self, undef, $where) = @_;
+
+  local (@{$self->{expand}}{qw(ident value)},
+         @{$self->{expand_op}}{qw(ident value)},
+         $self->{expand_op}{bind})
+     = (map {
+      my $orig = $self->{expand}{$_};
+      sub {
+        my $self = shift;
+        +{ -func => [
+          $self->{convert},
+          $self->$orig(@_)
+        ] };
+      }
+    } qw(ident value ident value bind)
+  ) if $self->{convert};
+
+  local $self->{expand}{func} = do {
+    my $orig = $self->{expand}{func};
+    sub {
+      my ($self, $type, $thing) = @_;
+      if (ref($thing) eq 'ARRAY' and $thing->[0] eq $self->{convert}
+          and @$thing == 2 and ref($thing->[1]) eq 'HASH'
+          and (
+            $thing->[1]{-ident}
+            or $thing->[1]{-value}
+            or $thing->[1]{-bind})
+          ) {
+        return { -func => $thing }; # already went through our expander
+      }
+      return $self->$orig($type, $thing);
+    }
+  } if $self->{convert};
+
   my $exp = $self->expand_expr($where);
-  +(where => ($self->{convert} ? +{ -convert_where => $exp } : $exp));
+  +(where => $exp);
 }
 
 sub _expand_select_clause_order_by {
@@ -160,11 +188,10 @@ sub _render_statement {
     };
     push @parts, $part;
   }
-  my ($sql, @bind) = @{ $self->join_query_parts(' ', @parts) };
-  return [
-    (our $Render_Top_Level ? $sql : '('.$sql.')'),
-    @bind
-  ];
+  my $q = $self->join_query_parts(' ', @parts);
+  return $self->join_query_parts('',
+    (our $Render_Top_Level ? $q : ('(', $q, ')'))
+  );
 }
 
 sub render_aqt {
@@ -185,7 +212,7 @@ sub select {
 
   my $stmt = do {
     if (ref(my $sel = $args[0]) eq 'HASH') {
-      $self->render_statement({ -select => $sel });
+      $sel
     } else {
       my %clauses;
       @clauses{qw(from select where order_by)} = @args;
@@ -206,32 +233,50 @@ sub select {
 sub update {
   my ($self, $table, $set, $where, $options) = @_;
 
-  return $self->render_statement({ -update => $_[1] }) if ref($_[1]) eq 'HASH';
-
-  my %clauses;
-  @clauses{qw(target set where)} = ($table, $set, $where);
-  puke "Unsupported data type specified to \$sql->update"
-    unless ref($clauses{set}) eq 'HASH';
-  @clauses{keys %$options} = values %$options;
-  return $self->render_statement({ -update => \%clauses });
+  my $stmt = do {
+    if (ref($table) eq 'HASH') {
+      $table
+    } else {
+      my %clauses;
+      @clauses{qw(target set where)} = ($table, $set, $where);
+      puke "Unsupported data type specified to \$sql->update"
+        unless ref($clauses{set}) eq 'HASH';
+      @clauses{keys %$options} = values %$options;
+      \%clauses;
+    }
+  };
+  my $rendered = $self->render_statement({ -update => $stmt });
+  return wantarray ? @$rendered : $rendered->[0];
 }
 
 sub delete {
   my ($self, $table, $where, $options) = @_;
 
-  return $self->render_statement({ -delete => $_[1] }) if ref($_[1]) eq 'HASH';
-
-  my %clauses = (target => $table, where => $where, %{$options||{}});
-  return $self->render_statement({ -delete => \%clauses });
+  my $stmt = do {
+    if (ref($table) eq 'HASH') {
+      $table;
+    } else {
+      my %clauses = (target => $table, where => $where, %{$options||{}});
+      \%clauses;
+    }
+  };
+  my $rendered = $self->render_statement({ -delete => $stmt });
+  return wantarray ? @$rendered : $rendered->[0];
 }
 
 sub insert {
   my ($self, $table, $data, $options) = @_;
 
-  return $self->render_statement({ -insert => $_[1] }) if ref($_[1]) eq 'HASH';
-
-  my %clauses = (target => $table, values => $data, %{$options||{}});
-  return $self->render_statement({ -insert => \%clauses });
+  my $stmt = do {
+    if (ref($table) eq 'HASH') {
+      $table;
+    } else {
+      my %clauses = (target => $table, values => $data, %{$options||{}});
+      \%clauses;
+    }
+  };
+  my $rendered = $self->render_statement({ -insert => $stmt });
+  return wantarray ? @$rendered : $rendered->[0];
 }
 
 sub _expand_insert_clause_target {
@@ -252,7 +297,10 @@ sub _expand_insert_clause_from {
   }
   return $data if ref($data) eq 'HASH' and $data->{-row};
   my ($f_aqt, $v_aqt) = $self->_expand_insert_values($data);
-  return (from => { -values => $v_aqt }, ($f_aqt ? (fields => $f_aqt) : ()));
+  return (
+    from => { -values => [ $v_aqt ] },
+    ($f_aqt ? (fields => $f_aqt) : ()),
+  );
 }
 
 sub _expand_insert_clause_returning {
@@ -272,14 +320,12 @@ sub _expand_values {
 
 sub _render_values {
   my ($self, undef, $values) = @_;
-  my $inner = [
-    $self->join_query_parts(' ',
-      $self->format_keyword('values'),
-      $self->join_query_parts(', ',
-        ref($values) eq 'ARRAY' ? @$values : $values
-      ),
+  my $inner = $self->join_query_parts(' ',
+    $self->format_keyword('values'),
+    $self->join_query_parts(', ',
+      ref($values) eq 'ARRAY' ? @$values : $values
     ),
-  ];
+  );
   return $self->join_query_parts('',
     (our $Render_Top_Level ? $inner : ('(', $inner, ')'))
   );