Allow scalar- and arrayrefrefs in select list

TODO: docs
dbsrgits · Feb 2, 2018 · caa82ff · caa82ff
1 parent daa4ccd
commit caa82ff
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
@@ -478,8 +478,21 @@ sub select {
 
 sub _select_fields {
   my ($self, $fields) = @_;
-  return ref $fields eq 'ARRAY' ? join ', ', map { $self->_quote($_) } @$fields
-                                : $fields;
+
+  $self->_SWITCH_refkind($fields, {
+    ARRAYREF => sub { join ', ', map { $self->_quote($_) } @$fields },
+
+    ARRAYREFREF => sub {
+      my ($s, @b) = @$$fields;
+      $self->_assert_bindval_matches_bindtype(@b);
+      ($s, @b);
+    },
+
+    SCALARREF => sub { $$fields },
+
+    # For back-compat
+    SCALAR => sub { $fields },
+  });
 }
 
 #======================================================================

diff --git a/t/01generate.t b/t/01generate.t
@@ -616,7 +616,21 @@ my @tests = (
               stmt_q => 'DELETE FROM `test` WHERE ( `requestor` IS NULL ) RETURNING `id`, `created_at`',
               bind   => []
       },
-);
+      {
+              func   => 'select',
+              args   => ['wibble', \['func(?)', 42]],
+              stmt   => 'select func(?) from wibble',
+              stmt_q => 'select func(?) from `wibble`',
+              bind   => [42],
+      },
+      {
+              func   => 'select',
+              args   => ['wibble', \'"wobble"'],
+              stmt   => 'select "wobble" from wibble',
+              stmt_q => 'select "wobble" from `wibble`',
+              bind   => [],
+      },
+    );
 
 # check is( not) => undef
 for my $op (qw(not is is_not), 'is not') {