feat: use multipart stream for request body (#242)

Author: simPod

composer.json

@@ -29,6 +29,7 @@
     "require": {
         "php": "^8.2",
         "guzzlehttp/promises": "^2.0",
+        "guzzlehttp/psr7": "^2.6",
         "php-http/client-common": "^2.0",
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0",

src/Client/Http/RequestFactory.php

@@ -4,10 +4,10 @@
 
 namespace SimPod\ClickHouseClient\Client\Http;
 
+use GuzzleHttp\Psr7\MultipartStream;
 use InvalidArgumentException;
 use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Message\UriFactoryInterface;
 use Psr\Http\Message\UriInterface;
 
@@ -24,7 +24,6 @@ final class RequestFactory
     /** @throws InvalidArgumentException */
     public function __construct(
         private RequestFactoryInterface $requestFactory,
-        private StreamFactoryInterface $streamFactory,
         UriFactoryInterface|null $uriFactory = null,
         UriInterface|string $uri = '',
     ) {
@@ -50,8 +49,6 @@ public function prepareRequest(RequestOptions $requestOptions): RequestInterface
             PHP_QUERY_RFC3986,
         );
 
-        $body = $this->streamFactory->createStream($requestOptions->sql);
-
         if ($this->uri === null) {
             $uri = $query === '' ? '' : '?' . $query;
         } else {
@@ -64,8 +61,14 @@ public function prepareRequest(RequestOptions $requestOptions): RequestInterface
         }
 
         $request = $this->requestFactory->createRequest('POST', $uri);
+
+        $streamElements = [['name' => 'query', 'contents' => $requestOptions->sql]];
+
         try {
-            $request = $request->withBody($body);
+            $body    = new MultipartStream($streamElements);
+            $request = $request
+                ->withHeader('Content-Type', 'multipart/form-data; boundary=' . $body->getBoundary())
+                ->withBody($body);
         } catch (InvalidArgumentException) {
             absurd();
         }

tests/Client/Http/RequestFactoryTest.php

@@ -20,7 +20,6 @@ public function testPrepareRequest(string $uri, string $expectedUri): void
     {
         $psr17Factory   = new Psr17Factory();
         $requestFactory = new RequestFactory(
-            $psr17Factory,
             $psr17Factory,
             $psr17Factory,
             $uri,
@@ -37,7 +36,7 @@ public function testPrepareRequest(string $uri, string $expectedUri): void
             $expectedUri,
             $request->getUri()->__toString(),
         );
-        self::assertSame('SELECT 1', $request->getBody()->__toString());
+        self::assertStringContainsString('SELECT 1', $request->getBody()->__toString());
     }
 
     /** @return Generator<string, array{string, string}> */