Unescape pgsql

amphp · Oct 25, 2020 · 81acca8 · 81acca8
1 parent 372f3f8
commit 81acca8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/examples/bytea.php b/examples/bytea.php
@@ -21,15 +21,16 @@
     /** @var \Amp\Sql\Statement $statement */
     $statement = yield $transaction->prepare('INSERT INTO test VALUES (?)');
 
-    yield $statement->execute([new ByteA($a = random_bytes(10))]);
-    yield $statement->execute([new ByteA($b = random_bytes(10))]);
-    yield $statement->execute([new ByteA($c = random_bytes(10))]);
+    yield $statement->execute([new ByteA($a = \random_bytes(10))]);
+    yield $statement->execute([new ByteA($b = \random_bytes(10))]);
+    yield $statement->execute([new ByteA($c = \random_bytes(10))]);
 
     /** @var \Amp\Postgres\ResultSet $result */
     $result = yield $transaction->execute('SELECT * FROM test WHERE val = :val', ['val' => new ByteA($a)]);
 
     while (yield $result->advance()) {
         $row = $result->getCurrent();
+        \assert($row['val'] === $a);
     }
 
     yield $transaction->rollback();

diff --git a/src/PgSqlHandle.php b/src/PgSqlHandle.php
@@ -152,10 +152,10 @@ public function __destruct()
     }
 
     /**
-     * Escape parameters (INTERNAL)
+     * Escape parameters (INTERNAL).
      *
      * @internal Only for internal use
-     * 
+     *
      * @param array $params
      * @return array
      */
@@ -164,7 +164,7 @@ public function escapeParams(array $params): array
         foreach ($params as $key => $param) {
             if ($param instanceof ByteA) {
                 $params[$key] = \pg_escape_bytea($this->handle, $param->getString());
-            } elseif (is_array($param)) {
+            } elseif (\is_array($param)) {
                 $params[$key] = $this->escapeParams($param);
             }
         }

diff --git a/src/PgSqlResultSet.php b/src/PgSqlResultSet.php
@@ -149,13 +149,15 @@ private function cast(int $column, string $value)
             case 1020: // box[] (semi-colon delimited)
                 return $this->parser->parse($value, null, ';');
 
+            case 1001: // bytea[]
+                return \pg_unescape_bytea($this->handle, $value);
+
             case 199:  // json[]
             case 629:  // line[]
             case 651:  // cidr[]
             case 719:  // circle[]
             case 775:  // macaddr8[]
             case 791:  // money[]
-            case 1001: // bytea[]
             case 1002: // char[]
             case 1003: // name[]
             case 1006: // int2vector[]

diff --git a/src/PqHandle.php b/src/PqHandle.php
@@ -296,10 +296,10 @@ private function release(): void
     }
 
     /**
-     * Escape parameters (INTERNAL)
+     * Escape parameters (INTERNAL).
      *
      * @internal Only for internal use
-     * 
+     *
      * @param array $params
      * @return array
      */
@@ -308,7 +308,7 @@ public function escapeParams(array $params): array
         foreach ($params as $key => $param) {
             if ($param instanceof ByteA) {
                 $params[$key] = $this->handle->escapeByteA($param->getString());
-            } elseif (is_array($param)) {
+            } elseif (\is_array($param)) {
                 $params[$key] = $this->escapeParams($param);
             }
         }