X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract%2FClauses.pm;h=6f311ae28cdc1031da8922bd3770da51b13fbdb2;hb=e5feec9f0925378912ad77c51469425b0908a310;hp=9f92b0081e856f9ee6eea3df193839eb84058d99;hpb=39544e0ebbfa3015024e1a46409c86e4c96d5d7f;p=scpubgit%2FQ-Branch.git

diff --git a/lib/SQL/Abstract/Clauses.pm b/lib/SQL/Abstract/Clauses.pm
index 9f92b00..6f311ae 100644
--- a/lib/SQL/Abstract/Clauses.pm
+++ b/lib/SQL/Abstract/Clauses.pm
@@ -16,59 +16,100 @@ sub register_defaults {
   $self->{clauses_of}{select} = [ qw(select from where order_by) ];
   $self->{expand}{select} = sub { shift->_expand_statement(@_) };
   $self->{render}{select} = sub { shift->_render_statement(select => @_) };
-  $self->{expand_clause}{'select.select'} = sub {
-    $_[0]->_expand_maybe_list_expr($_[1], -ident)
-  };
-  $self->{expand_clause}{'select.from'} = sub {
-    $_[0]->_expand_maybe_list_expr($_[1], -ident)
-  };
-  $self->{expand_clause}{'select.where'} = 'expand_expr';
-  $self->{expand_clause}{'select.order_by'} = '_expand_order_by';
+  $self->{expand_clause}{"select.$_"} = "_expand_select_clause_$_"
+    for @{$self->{clauses_of}{select}};
   $self->{clauses_of}{update} = [ qw(update set where returning) ];
   $self->{expand}{update} = sub { shift->_expand_statement(@_) };
   $self->{render}{update} = sub { shift->_render_statement(update => @_) };
-  $self->{expand_clause}{'update.update'} = sub {
-    $_[0]->expand_expr($_[1], -ident)
-  };
-  $self->{expand_clause}{'update.set'} = '_expand_update_set_values';
-  $self->{expand_clause}{'update.where'} = 'expand_expr';
-  $self->{expand_clause}{'update.returning'} = sub {
-    shift->_expand_maybe_list_expr(@_, -ident);
-  };
+  $self->{expand_clause}{"update.$_"} = "_expand_update_clause_$_"
+    for @{$self->{clauses_of}{update}};
   $self->{clauses_of}{delete} = [ qw(delete_from where returning) ];
   $self->{expand}{delete} = sub { shift->_expand_statement(@_) };
   $self->{render}{delete} = sub { shift->_render_statement(delete => @_) };
-  $self->{expand_clause}{'delete.delete_from'} = sub {
-    $_[0]->_expand_maybe_list_expr($_[1], -ident)
-  };
-  $self->{expand_clause}{'delete.where'} = 'expand_expr';
-  $self->{expand_clause}{'delete.returning'} = sub {
-    shift->_expand_maybe_list_expr(@_, -ident);
-  };
-  $self->{clauses_of}{insert} = [ 'insert_into', '', 'values', 'returning' ];
+  $self->{expand_clause}{"delete.$_"} = "_expand_delete_clause_$_"
+    for @{$self->{clauses_of}{delete}};
+  $self->{clauses_of}{insert} = [
+    'insert_into', 'fields', 'values', 'returning'
+  ];
   $self->{expand}{insert} = sub { shift->_expand_statement(@_) };
   $self->{render}{insert} = sub { shift->_render_statement(insert => @_) };
   $self->{expand_clause}{'insert.insert_into'} = sub {
     shift->expand_expr(@_, -ident);
   };
+  $self->{expand_clause}{'insert.values'} = '_expand_insert_clause_values';
   $self->{expand_clause}{'insert.returning'} = sub {
     shift->_expand_maybe_list_expr(@_, -ident);
   };
+  $self->{render_clause}{'insert.fields'} = sub {
+    return $_[0]->render_aqt({ -row => [ $_[1] ] });
+  };
   return $self;
 }
 
+sub _expand_select_clause_select {
+  my ($self, $select) = @_;
+  +(select => $self->_expand_maybe_list_expr($select, -ident));
+}
+
+sub _expand_select_clause_from {
+  my ($self, $from) = @_;
+  +(from => $self->_expand_maybe_list_expr($from, -ident));
+}
+
+sub _expand_select_clause_where {
+  my ($self, $where) = @_;
+  +(where => $self->expand_expr($where));
+}
+
+sub _expand_select_clause_order_by {
+  my ($self, $order_by) = @_;
+  +(order_by => $self->_expand_order_by($order_by));
+}
+
+sub _expand_update_clause_update {
+  my ($self, $target) = @_;
+  +(update => $self->expand_expr($target, -ident));
+}
+
+sub _expand_update_clause_set {
+  return $_[1] if ref($_[1]) eq 'HASH' and ($_[1]->{-op}||[''])->[0] eq ',';
+  +(set => shift->_expand_update_set_values(@_));
+}
+
+sub _expand_update_clause_where {
+  +(where => shift->expand_expr(@_));
+}
+
+sub _expand_update_clause_returning {
+  +(returning => shift->_expand_maybe_list_expr(@_, -ident));
+}
+
+sub _expand_delete_clause_delete_from {
+  +(delete_from => shift->_expand_maybe_list_expr(@_, -ident));
+}
+
+sub _expand_delete_clause_where { +(where => shift->expand_expr(@_)); }
+
+sub _expand_delete_clause_returning {
+  +(returning => shift->_expand_maybe_list_expr(@_, -ident));
+}
+
 sub _expand_statement {
   my ($self, $type, $args) = @_;
   my $ec = $self->{expand_clause};
   return +{ "-${type}" => +{
-    map +($_ => (do {
+    map {
       my $val = $args->{$_};
       if (defined($val) and my $exp = $ec->{"${type}.$_"}) {
-        $self->$exp($val);
+        if ((my (@exp) = $self->$exp($val)) == 1) {
+          ($_ => $exp[0])
+        } else {
+          @exp
+        }
       } else {
-        $val;
+        ($_ => $val)
       }
-    })), sort keys %$args
+    } sort keys %$args
   } };
 }
 
@@ -78,12 +119,19 @@ sub _render_statement {
   foreach my $clause (@{$self->{clauses_of}{$type}}) {
     next unless my $clause_expr = $args->{$clause};
     local $self->{convert_where} = $self->{convert} if $clause eq 'where';
-    my ($sql, @bind) = $self->render_aqt($clause_expr);
+    my ($sql) = my @part = do {
+      if (my $rdr = $self->{render_clause}{"${type}.${clause}"}) {
+        $self->$rdr($clause_expr);
+      } else {
+        my ($clause_sql, @bind) = $self->render_aqt($clause_expr);
+        my $sql = join ' ',
+          $self->_sqlcase(join ' ', split '_', $clause),
+          $clause_sql;
+        ($sql, @bind);
+      }
+    };
     next unless defined($sql) and length($sql);
-    push @parts, [
-      $self->_sqlcase(join ' ', split '_', $clause).' '.$sql,
-      @bind
-    ];
+    push @parts, \@part;
   }
   return $self->_join_parts(' ', @parts);
 }
@@ -123,12 +171,16 @@ sub delete {
 
 sub insert {
   my ($self, $table, $data, $options) = @_;
-  my %clauses = (insert_into => $table, %{$options||{}});
-  my ($f_aqt, $v_aqt) = $self->_expand_insert_values($data);
-  $clauses{''} = $f_aqt if $f_aqt;
-  $clauses{values} = $v_aqt;
+  my %clauses = (insert_into => $table, values => $data, %{$options||{}});
   my ($sql, @bind) = $self->render_expr({ -insert => \%clauses });
   return wantarray ? ($sql, @bind) : $sql;
 }
 
+sub _expand_insert_clause_values {
+  my ($self, $data) = @_;
+  return $data if ref($data) eq 'HASH' and $data->{-row};
+  my ($f_aqt, $v_aqt) = $self->_expand_insert_values($data);
+  return (values => $v_aqt, ($f_aqt ? (fields => $f_aqt) : ()));
+}
+
 1;