From b17286099803e7c69860f8827ed22de59d9e9c8e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 25 Sep 2022 09:53:34 +0200 Subject: Merging upstream version 6.2.1. Signed-off-by: Daniel Baumann --- sqlglot/__init__.py | 2 +- sqlglot/expressions.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'sqlglot') diff --git a/sqlglot/__init__.py b/sqlglot/__init__.py index 44d349b..9ac1759 100644 --- a/sqlglot/__init__.py +++ b/sqlglot/__init__.py @@ -20,7 +20,7 @@ from sqlglot.generator import Generator from sqlglot.parser import Parser from sqlglot.tokens import Tokenizer, TokenType -__version__ = "6.2.0" +__version__ = "6.2.1" pretty = False diff --git a/sqlglot/expressions.py b/sqlglot/expressions.py index 9299132..de615d6 100644 --- a/sqlglot/expressions.py +++ b/sqlglot/expressions.py @@ -912,14 +912,18 @@ class Properties(Expression): @staticmethod def _convert_value(value): + if value is None: + return NULL if isinstance(value, Expression): return value + if isinstance(value, bool): + return Boolean(this=value) if isinstance(value, str): return Literal.string(value) if isinstance(value, numbers.Number): return Literal.number(value) if isinstance(value, list): - return Tuple(expressions=[_convert_value(v) for v in value]) + return Tuple(expressions=[Properties._convert_value(v) for v in value]) raise ValueError(f"Unsupported type '{type(value)}' for value '{value}'") -- cgit v1.2.3