From 49af28576db02470fe1d2de04e3901309b60c2e4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 10 Jul 2023 07:36:29 +0200 Subject: Merging upstream version 17.3.0. Signed-off-by: Daniel Baumann --- sqlglot/generator.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'sqlglot/generator.py') diff --git a/sqlglot/generator.py b/sqlglot/generator.py index 1ce2aaa..4ac988f 100644 --- a/sqlglot/generator.py +++ b/sqlglot/generator.py @@ -1215,7 +1215,8 @@ class Generator: system_time = expression.args.get("system_time") system_time = f" {self.sql(expression, 'system_time')}" if system_time else "" - return f"{table}{system_time}{alias}{hints}{pivots}{joins}{laterals}" + sql = f"{table}{system_time}{alias}{hints}{pivots}{joins}{laterals}" + return f"({sql})" if expression.args.get("wrapped") else sql def tablesample_sql( self, expression: exp.TableSample, seed_prefix: str = "SEED", sep=" AS " @@ -2289,11 +2290,14 @@ class Generator: def function_fallback_sql(self, expression: exp.Func) -> str: args = [] - for arg_value in expression.args.values(): + + for key in expression.arg_types: + arg_value = expression.args.get(key) + if isinstance(arg_value, list): for value in arg_value: args.append(value) - else: + elif arg_value is not None: args.append(arg_value) return self.func(expression.sql_name(), *args) -- cgit v1.2.3