diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-01-31 05:44:41 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-01-31 05:44:41 +0000 |
commit | 376de8b6892deca7dc5d83035c047f1e13eb67ea (patch) | |
tree | 334a1753cd914294aa99128fac3fb59bf14dc10f /sqlglot/dialects/clickhouse.py | |
parent | Releasing debian version 20.9.0-1. (diff) | |
download | sqlglot-376de8b6892deca7dc5d83035c047f1e13eb67ea.tar.xz sqlglot-376de8b6892deca7dc5d83035c047f1e13eb67ea.zip |
Merging upstream version 20.11.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sqlglot/dialects/clickhouse.py')
-rw-r--r-- | sqlglot/dialects/clickhouse.py | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/sqlglot/dialects/clickhouse.py b/sqlglot/dialects/clickhouse.py index f2e4fe1..1248edc 100644 --- a/sqlglot/dialects/clickhouse.py +++ b/sqlglot/dialects/clickhouse.py @@ -88,6 +88,8 @@ class ClickHouse(Dialect): "UINT8": TokenType.UTINYINT, "IPV4": TokenType.IPV4, "IPV6": TokenType.IPV6, + "AGGREGATEFUNCTION": TokenType.AGGREGATEFUNCTION, + "SIMPLEAGGREGATEFUNCTION": TokenType.SIMPLEAGGREGATEFUNCTION, } SINGLE_TOKENS = { @@ -548,6 +550,8 @@ class ClickHouse(Dialect): exp.DataType.Type.UTINYINT: "UInt8", exp.DataType.Type.IPV4: "IPv4", exp.DataType.Type.IPV6: "IPv6", + exp.DataType.Type.AGGREGATEFUNCTION: "AggregateFunction", + exp.DataType.Type.SIMPLEAGGREGATEFUNCTION: "SimpleAggregateFunction", } TRANSFORMS = { @@ -651,12 +655,16 @@ class ClickHouse(Dialect): def after_limit_modifiers(self, expression: exp.Expression) -> t.List[str]: return super().after_limit_modifiers(expression) + [ - self.seg("SETTINGS ") + self.expressions(expression, key="settings", flat=True) - if expression.args.get("settings") - else "", - self.seg("FORMAT ") + self.sql(expression, "format") - if expression.args.get("format") - else "", + ( + self.seg("SETTINGS ") + self.expressions(expression, key="settings", flat=True) + if expression.args.get("settings") + else "" + ), + ( + self.seg("FORMAT ") + self.sql(expression, "format") + if expression.args.get("format") + else "" + ), ] def parameterizedagg_sql(self, expression: exp.ParameterizedAgg) -> str: |