From: Matt S Trout <mst@shadowcat.co.uk>
Date: Mon, 25 Mar 2019 03:20:01 +0000 (+0000)
Subject: make scalar/blessed args cleaner
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=105cbaea841d055fdf1b2df8aabdf5d38676a0d8;p=scpubgit%2FQ-Branch.git

make scalar/blessed args cleaner
---

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index 258f4ef..3b7d65b 100644
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -626,16 +626,14 @@ sub _expand_expr_hashpair_ident {
   my $ik = $self->_expand_ident(-ident => $k);
   if (!ref($v) or Scalar::Util::blessed($v)) {
     my $d = our $Default_Scalar_To;
-    return +{
-      -op => [
-        $self->{cmp},
-        $ik,
-        ($d
-          ? $self->_expand_expr($d => $v)
-          : { -bind => [ $k, $v ] }
-        )
-      ]
-    };
+    local our $Cur_Col_Meta = $k;
+    return $self->_expand_expr_hashpair_ident(
+      $k,
+      ($d
+        ? $self->_expand_expr($d => $v)
+        : { -value => $v }
+      )
+    );
   }
   if (ref($v) eq 'HASH') {
     if (keys %$v > 1) {