Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 19 additions & 3 deletions clickhouse_sqlalchemy/drivers/compilers/typecompiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,26 @@ def visit_ipv6(self, type_, **kw):
return 'IPv6'

def visit_tuple(self, type_, **kw):
cols = (
self.process(type_api.to_instance(nested_type), **kw)
cols = []
is_named_type = all([
isinstance(nested_type, tuple) and len(nested_type) == 2
for nested_type in type_.nested_types
)
])
if is_named_type:
for nested_type in type_.nested_types:
name = nested_type[0]
name_type = nested_type[1]
inner_type = self.process(
type_api.to_instance(name_type),
**kw
)
cols.append(
f'{name} {inner_type}')
else:
cols = (
self.process(type_api.to_instance(nested_type), **kw)
for nested_type in type_.nested_types
)
return 'Tuple(%s)' % ', '.join(cols)

def visit_map(self, type_, **kw):
Expand Down
20 changes: 20 additions & 0 deletions tests/test_ddl.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,26 @@ def test_create_table_tuple(self):
'ENGINE = Memory'
)

def test_create_table_named_tuple(self):
table = Table(
't1', self.metadata(),
Column(
'x',
types.Tuple(
('name', types.String),
('value', types.Float32)
)
),
engines.Memory()
)

self.assertEqual(
self.compile(CreateTable(table)),
'CREATE TABLE t1 ('
'x Tuple(name String, value Float32)) '
'ENGINE = Memory'
)

@require_server_version(21, 1, 3)
def test_create_table_map(self):
table = Table(
Expand Down