finish porting to join_query_parts as arrayref

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

diff --git a/lib/SQL/Abstract/Clauses.pm b/lib/SQL/Abstract/Clauses.pm
index 1d1f05e..f60ddad 100644 (file)
--- a/lib/SQL/Abstract/Clauses.pm
+++ b/lib/SQL/Abstract/Clauses.pm
@@ -148,24 +148,23 @@ sub _render_statement {
   my @parts;
   foreach my $clause (@{$self->{clauses_of}{$type}}) {
     next unless my $clause_expr = $args->{$clause};
-    my @part = do {
+    my $part = do {
       if (my $rdr = $self->{render_clause}{"${type}.${clause}"}) {
         $self->$rdr($clause, $clause_expr);
       } else {
-        my ($clause_sql, @bind) = $self->render_aqt($clause_expr, 1);
-        my $sql = join ' ',
-          $self->_sqlcase(join ' ', split '_', $clause),
-          $clause_sql;
-        ($sql, @bind);
+        $self->join_query_parts(' ',
+          $self->format_keyword($clause),
+          $self->render_aqt($clause_expr, 1)
+        );
       }
     };
-    push @parts, \@part;
+    push @parts, $part;
   }
-  my ($sql, @bind) = $self->join_query_parts(' ', @parts);
-  return (
+  my ($sql, @bind) = @{ $self->join_query_parts(' ', @parts) };
+  return [
     (our $Render_Top_Level ? $sql : '('.$sql.')'),
     @bind
-  );
+  ];
 }
 
 sub render_aqt {
@@ -176,58 +175,81 @@ sub render_aqt {
 
 sub render_statement {
   my ($self, $expr, $default_scalar_to) = @_;
-  my ($sql, @bind) = $self->render_aqt(
+  $self->render_aqt(
     $self->expand_expr($expr, $default_scalar_to), 1
   );
-  return (wantarray ? ($sql, @bind) : $sql);
 }
 
 sub select {
   my ($self, @args) = @_;
 
-  return $self->render_statement({ -select => $_[1] }) if ref($_[1]) eq 'HASH';
-
-  my %clauses;
-  @clauses{qw(from select where order_by)} = @args;
+  my $stmt = do {
+    if (ref(my $sel = $args[0]) eq 'HASH') {
+      $sel
+    } else {
+      my %clauses;
+      @clauses{qw(from select where order_by)} = @args;
 
-  # This oddity is to literalify since historically SQLA doesn't quote
-  # a single identifier argument, so we convert it into a literal
+      # This oddity is to literalify since historically SQLA doesn't quote
+      # a single identifier argument, so we convert it into a literal
 
-  $clauses{select} = { -literal => [ $clauses{select}||'*' ] }
-    unless ref($clauses{select});
+      $clauses{select} = { -literal => [ $clauses{select}||'*' ] }
+        unless ref($clauses{select});
+      \%clauses;
+    }
+  };
 
-  return $self->render_statement({ -select => \%clauses });
+  my $rendered = $self->render_statement({ -select => $stmt });
+  return wantarray ? @$rendered : $rendered->[0];
 }
 
 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 {
@@ -268,14 +290,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, ')'))
   );