thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #71749 from ClickHouse/backport/24.9/71369

Browse Source 
Backport #71369 to 24.9: Check suspicious and experimental types in JSON type hints
This commit is contained in:
robot-clickhouse 2024-11-11 17:20:09 +01:00 committed by GitHub
commit 7600fa869f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/DataTypes/DataTypeObject.cpp
View File

@ -230,6 +230,15 @@ MutableColumnPtr DataTypeObject::createColumn() const
return ColumnObject::create(std::move(typed_path_columns), max_dynamic_paths, max_dynamic_types); return ColumnObject::create(std::move(typed_path_columns), max_dynamic_paths, max_dynamic_types);
} }
void DataTypeObject::forEachChild(const ChildCallback & callback) const
{
for (const auto & [path, type] : typed_paths)
{
callback(*type);
type->forEachChild(callback);
}
}
namespace namespace
{ {

2
src/DataTypes/DataTypeObject.h
View File

@ -50,6 +50,8 @@ public:
bool equals(const IDataType & rhs) const override; bool equals(const IDataType & rhs) const override;
void forEachChild(const ChildCallback &) const override;
bool hasDynamicSubcolumnsData() const override { return true; } bool hasDynamicSubcolumnsData() const override { return true; }
std::unique_ptr<SubstreamData> getDynamicSubcolumnData(std::string_view subcolumn_name, const SubstreamData & data, bool throw_if_null) const override; std::unique_ptr<SubstreamData> getDynamicSubcolumnData(std::string_view subcolumn_name, const SubstreamData & data, bool throw_if_null) const override;

1
tests/queries/0_stateless/03214_json_typed_dynamic_path.sql
View File

@ -1,6 +1,7 @@
-- Tags: no-fasttest -- Tags: no-fasttest
set allow_experimental_json_type = 1; set allow_experimental_json_type = 1;
set allow_experimental_dynamic_type = 1;
drop table if exists test; drop table if exists test;
create table test (json JSON(a Dynamic)) engine=MergeTree order by tuple() settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1; create table test (json JSON(a Dynamic)) engine=MergeTree order by tuple() settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;
insert into test select '{"a" : 42}'; insert into test select '{"a" : 42}';

0
tests/queries/0_stateless/03261_json_hints_types_check.reference Normal file
View File

9
tests/queries/0_stateless/03261_json_hints_types_check.sql Normal file
View File

@ -0,0 +1,9 @@
set allow_experimental_json_type=1;
set allow_experimental_variant_type=0;
set allow_experimental_object_type=0;
select '{}'::JSON(a LowCardinality(Int128)); -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
select '{}'::JSON(a FixedString(100000)); -- {serverError ILLEGAL_COLUMN}
select '{}'::JSON(a Variant(Int32)); -- {serverError ILLEGAL_COLUMN}
select '{}'::JSON(a Object('json')); -- {serverError ILLEGAL_COLUMN}