Skip to content

fix(params): quote nested DateTime64 values #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simPod wants to merge 1 commit into
base: master
Choose a base branch
from
+114 −6
Open

fix(params): quote nested DateTime64 values #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions src/Param/ParamValueConverterRegistry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,16 @@ public function __construct(array $registry = [])

'UUID' => self::stringConverter(),

'Nullable' => fn (mixed $v, Type $type) => $this->get($type->params)($v, null, false),
'LowCardinality' => fn (mixed $v, Type $type) => $this->get($type->params)($v, null, false),
'Nullable' => fn (
mixed $v,
Type $type,
bool $nested = false,
) => $this->convertWrappedValue($v, $type, $nested),
'LowCardinality' => fn (
mixed $v,
Type $type,
bool $nested = false,
) => $this->convertWrappedValue($v, $type, $nested),

'decimal' => self::decimalConverter(),
'decimal32' => self::decimalConverter(),
Expand All @@ -102,13 +110,17 @@ public function __construct(array $registry = [])
'date32' => self::dateConverter(),
'datetime' => self::dateTimeConverter(),
'datetime32' => self::dateTimeConverter(),
'datetime64' => static function (mixed $value) {
'datetime64' => static function (mixed $value, Type|string|null $type = null, bool $nested = false) {
if ($value instanceof DateTimeInterface) {
return $value->format('U.u');
$value = $nested
? $value->format('Y-m-d H:i:s.u')
: $value->format('U.u');
}

if (is_string($value) || is_float($value) || is_int($value)) {
return $value;
return $nested
? "'" . Escaper::escape((string) $value) . "'"
: $value;
}
Comment on lines +113 to 124

throw UnsupportedParamValue::type($value);
Expand Down Expand Up @@ -236,7 +248,7 @@ public function __construct(array $registry = [])
return '(' . $innerExpression . ')';
},
];
$this->registry = array_merge($defaultRegistry, $registry);
$this->registry = array_merge($defaultRegistry, $registry);
}

/**
Expand Down Expand Up @@ -359,4 +371,12 @@ private function splitTypes(string $types): array

return $result;
}

/** @throws UnsupportedParamType */
private function convertWrappedValue(mixed $value, Type $type, bool $nested): mixed
{
$innerType = Type::fromString($type->params);

return $this->get($innerType)($value, $innerType, $nested);
}
}
88 changes: 88 additions & 0 deletions tests/Client/Http/RequestFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,92 @@ public function testMultipleNestedParamsParsed(): void
self::assertStringContainsString('param_serverIds', $body);
self::assertStringContainsString('param_sensorIds', $body);
}

public function testNestedDateTime64ParamIsQuoted(): void
{
$requestFactory = new RequestFactory(
new ParamValueConverterRegistry(),
new Psr17Factory(),
new Psr17Factory(),
);

$request = $requestFactory->prepareSqlRequest(
'SELECT {inputs:Array(Tuple(DateTime64(6), UUID))}',
new RequestSettings(
new EmptySettingsProvider(),
new EmptySettingsProvider(),
),
new RequestOptions(
[
'inputs' => [
[
new DateTimeImmutable('2026-07-30 12:00:00.123456'),
'c8965e35-e785-4b05-a675-000000000000',
],
],
],
),
);

self::assertStringContainsString(
"('2026-07-30 12:00:00.123456','c8965e35-e785-4b05-a675-000000000000')",
$request->getBody()->__toString(),
);
}

public function testTopLevelDateTime64ParamRemainsNumeric(): void
{
$requestFactory = new RequestFactory(
new ParamValueConverterRegistry(),
new Psr17Factory(),
new Psr17Factory(),
);

$request = $requestFactory->prepareSqlRequest(
'SELECT {value:DateTime64(6)}',
new RequestSettings(
new EmptySettingsProvider(),
new EmptySettingsProvider(),
),
new RequestOptions(
[
'value' => new DateTimeImmutable('2026-07-30 12:00:00.123456'),
],
),
);

self::assertStringContainsString('1785412800.123456', $request->getBody()->__toString());
}

public function testWrappedNestedDateTime64ParamIsQuoted(): void
{
$requestFactory = new RequestFactory(
new ParamValueConverterRegistry(),
new Psr17Factory(),
new Psr17Factory(),
);

$request = $requestFactory->prepareSqlRequest(
'SELECT {inputs:Array(Tuple(Nullable(DateTime64(6)), LowCardinality(DateTime64(6))))}',
new RequestSettings(
new EmptySettingsProvider(),
new EmptySettingsProvider(),
),
new RequestOptions(
[
'inputs' => [
[
new DateTimeImmutable('2026-07-30 12:00:00.123456'),
new DateTimeImmutable('2026-07-30 12:01:00.123456'),
],
],
],
),
);

self::assertStringContainsString(
"('2026-07-30 12:00:00.123456','2026-07-30 12:01:00.123456')",
$request->getBody()->__toString(),
);
}
}
Loading