feat: undeprecate ValueFormatter (#250)

- do not use multipart stream when there are no native query params present
simPod · Jan 18, 2024 · 2b104bf · 2b104bf
1 parent 52ebb6d
commit 2b104bf
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 29 deletions.
diff --git a/src/Client/Http/RequestFactory.php b/src/Client/Http/RequestFactory.php
@@ -8,6 +8,7 @@
 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;
 use SimPod\ClickHouseClient\Exception\UnsupportedParamType;
@@ -31,6 +32,7 @@ final class RequestFactory
     public function __construct(
         private ParamValueConverterRegistry $paramValueConverterRegistry,
         private RequestFactoryInterface $requestFactory,
+        private StreamFactoryInterface $streamFactory,
         UriFactoryInterface|null $uriFactory = null,
         UriInterface|string $uri = '',
     ) {
@@ -71,37 +73,39 @@ public function prepareRequest(RequestOptions $requestOptions): RequestInterface
         $request = $this->requestFactory->createRequest('POST', $uri);
 
         preg_match_all('~\{([a-zA-Z\d]+):([a-zA-Z\d ]+(\(.+\))?)}~', $requestOptions->sql, $matches);
-
-        $typeToParam = array_reduce(
-            array_keys($matches[1]),
-            static function (array $acc, string|int $k) use ($matches) {
-                $acc[$matches[1][$k]] = Type::fromString($matches[2][$k]);
-
-                return $acc;
-            },
-            [],
-        );
-
-        $streamElements = [['name' => 'query', 'contents' => $requestOptions->sql]];
-        foreach ($requestOptions->params as $name => $value) {
-            $type = $typeToParam[$name] ?? null;
-            if ($type === null) {
-                continue;
+        if ($matches === []) {
+            $body = $this->streamFactory->createStream($requestOptions->sql);
+        } else {
+            $typeToParam = array_reduce(
+                array_keys($matches[1]),
+                static function (array $acc, string|int $k) use ($matches) {
+                    $acc[$matches[1][$k]] = Type::fromString($matches[2][$k]);
+
+                    return $acc;
+                },
+                [],
+            );
+
+            $streamElements = [['name' => 'query', 'contents' => $requestOptions->sql]];
+            foreach ($requestOptions->params as $name => $value) {
+                $type = $typeToParam[$name] ?? null;
+                if ($type === null) {
+                    continue;
+                }
+
+                $streamElements[] = [
+                    'name' => 'param_' . $name,
+                    'contents' => $this->paramValueConverterRegistry->get($type)($value, $type, false),
+                ];
             }
 
-            $streamElements[] = [
-                'name' => 'param_' . $name,
-                'contents' => $this->paramValueConverterRegistry->get($type)($value, $type, false),
-            ];
-        }
-
-        try {
-            $body    = new MultipartStream($streamElements);
-            $request = $request
-                ->withHeader('Content-Type', 'multipart/form-data; boundary=' . $body->getBoundary())
-                ->withBody($body);
-        } catch (InvalidArgumentException) {
-            absurd();
+            try {
+                $body    = new MultipartStream($streamElements);
+                $request = $request->withBody($body)
+                    ->withHeader('Content-Type', 'multipart/form-data; boundary=' . $body->getBoundary());
+            } catch (InvalidArgumentException) {
+                absurd();
+            }
         }
 
         return $request;

diff --git a/tests/Client/Http/RequestFactoryTest.php b/tests/Client/Http/RequestFactoryTest.php
@@ -24,6 +24,7 @@ public function testPrepareRequest(string $uri, string $expectedUri): void
             new ParamValueConverterRegistry(),
             $psr17Factory,
             $psr17Factory,
+            $psr17Factory,
             $uri,
         );
 

diff --git a/tests/WithClient.php b/tests/WithClient.php
@@ -90,6 +90,7 @@ private static function restartClickHouseClient(): void
                 new ParamValueConverterRegistry(),
                 new Psr17Factory(),
                 new Psr17Factory(),
+                new Psr17Factory(),
             ),
         );
 
@@ -105,6 +106,7 @@ private static function restartClickHouseClient(): void
                 new ParamValueConverterRegistry(),
                 new Psr17Factory(),
                 new Psr17Factory(),
+                new Psr17Factory(),
             ),
         );
 
@@ -120,6 +122,7 @@ private static function restartClickHouseClient(): void
                 new ParamValueConverterRegistry(),
                 new Psr17Factory(),
                 new Psr17Factory(),
+                new Psr17Factory(),
             ),
         );