Merging upstream version 17.2.0.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
06c5965633
commit
ff2afd7448
91 changed files with 42856 additions and 42624 deletions
|
@ -109,10 +109,11 @@ class ClickHouse(Dialect):
|
|||
|
||||
QUERY_MODIFIER_PARSERS = {
|
||||
**parser.Parser.QUERY_MODIFIER_PARSERS,
|
||||
"settings": lambda self: self._parse_csv(self._parse_conjunction)
|
||||
if self._match(TokenType.SETTINGS)
|
||||
else None,
|
||||
"format": lambda self: self._parse_id_var() if self._match(TokenType.FORMAT) else None,
|
||||
TokenType.SETTINGS: lambda self: (
|
||||
"settings",
|
||||
self._advance() or self._parse_csv(self._parse_conjunction),
|
||||
),
|
||||
TokenType.FORMAT: lambda self: ("format", self._advance() or self._parse_id_var()),
|
||||
}
|
||||
|
||||
def _parse_conjunction(self) -> t.Optional[exp.Expression]:
|
||||
|
@ -155,9 +156,12 @@ class ClickHouse(Dialect):
|
|||
return this
|
||||
|
||||
def _parse_table(
|
||||
self, schema: bool = False, alias_tokens: t.Optional[t.Collection[TokenType]] = None
|
||||
self,
|
||||
schema: bool = False,
|
||||
joins: bool = False,
|
||||
alias_tokens: t.Optional[t.Collection[TokenType]] = None,
|
||||
) -> t.Optional[exp.Expression]:
|
||||
this = super()._parse_table(schema=schema, alias_tokens=alias_tokens)
|
||||
this = super()._parse_table(schema=schema, joins=joins, alias_tokens=alias_tokens)
|
||||
|
||||
if self._match(TokenType.FINAL):
|
||||
this = self.expression(exp.Final, this=this)
|
||||
|
@ -273,6 +277,7 @@ class ClickHouse(Dialect):
|
|||
return None
|
||||
|
||||
class Generator(generator.Generator):
|
||||
QUERY_HINTS = False
|
||||
STRUCT_DELIMITER = ("(", ")")
|
||||
|
||||
TYPE_MAPPING = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue