diff --git a/src/Param/ParamValueConverterRegistry.php b/src/Param/ParamValueConverterRegistry.php index 7978553..60533da 100644 --- a/src/Param/ParamValueConverterRegistry.php +++ b/src/Param/ParamValueConverterRegistry.php @@ -41,7 +41,6 @@ final class ParamValueConverterRegistry 'decimal128', 'decimal256', 'enum', - 'object', 'json', ]; @@ -104,7 +103,6 @@ public function __construct() 'Enum64' => self::noopConverter(), 'json' => static fn (array|string $value) => is_string($value) ? $value : json_encode($value), - 'object' => fn (mixed $v, Type $type) => $this->get(trim($type->params, "'"))($v, $type, true), 'Map' => self::noopConverter(), 'Nested' => function (array|string $v, Type $type) { if (is_string($v)) { diff --git a/tests/Param/ParamValueConverterRegistryTest.php b/tests/Param/ParamValueConverterRegistryTest.php index d7cd325..3634d68 100644 --- a/tests/Param/ParamValueConverterRegistryTest.php +++ b/tests/Param/ParamValueConverterRegistryTest.php @@ -30,7 +30,7 @@ final class ParamValueConverterRegistryTest extends TestCaseBase { use WithClient; - private const VersionIntervalJsonObject = 2211; + private const VersionIntervalJson = 2301; /** @var array */ private static array $types = []; @@ -72,6 +72,7 @@ public function testAllTypesAreCovered(): void 'AggregateFunction', 'SimpleAggregateFunction', 'Nothing', + 'Object', ]; $registry = new ParamValueConverterRegistry(); @@ -127,11 +128,9 @@ public static function providerConvert(): Generator "((1,'k'),1,2)", ]; - if (ClickHouseVersion::get() >= self::VersionIntervalJsonObject) { + if (ClickHouseVersion::get() >= self::VersionIntervalJson) { yield 'JSON' => ['JSON', '{"k":"v"}', '{"k":"v"}']; yield 'JSON (array)' => ['JSON', ['k' => 'v'], '{"k":"v"}']; - yield 'Object' => ["Object('JSON')", '{"k":"v"}', '{"k":"v"}']; - yield 'Object (array)' => ["Object('JSON')", ['k' => 'v'], '{"k":"v"}']; } yield 'Map' => ['Map(String, UInt64)', "{'k1':1}", "{'k1':1}"]; @@ -219,7 +218,7 @@ public static function providerConvert(): Generator yield 'Decimal256' => ['Decimal256(2)', 3.33, '3.33']; } - if (ClickHouseVersion::get() >= self::VersionIntervalJsonObject) { + if (ClickHouseVersion::get() >= self::VersionIntervalJson) { yield 'IntervalNanosecond' => ['IntervalNanosecond', 1, '1']; yield 'IntervalMicrosecond' => ['IntervalMicrosecond', 1, '1']; yield 'IntervalMillisecond' => ['IntervalMillisecond', 1, '1'];