From a836031d3686be67c590bf4bbf8673820c23d598 Mon Sep 17 00:00:00 2001 From: fanchi Date: Mon, 2 Jul 2018 10:47:36 +0300 Subject: [PATCH] Trivial fix nullable field disregard extra_null_values --- src/infi/clickhouse_orm/fields.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/infi/clickhouse_orm/fields.py b/src/infi/clickhouse_orm/fields.py index fc40790..8fd8a6e 100644 --- a/src/infi/clickhouse_orm/fields.py +++ b/src/infi/clickhouse_orm/fields.py @@ -385,12 +385,12 @@ class NullableField(Field): super(NullableField, self).__init__(default, alias, materialized, readonly=None) def to_python(self, value, timezone_in_use): - if value == '\\N' or value is None: + if value == '\\N' or value in self._null_values: return None return self.inner_field.to_python(value, timezone_in_use) def validate(self, value): - value is None or self.inner_field.validate(value) + value in self._null_values or self.inner_field.validate(value) def to_db_string(self, value, quote=True): if value in self._null_values: @@ -398,5 +398,4 @@ class NullableField(Field): return self.inner_field.to_db_string(value, quote=quote) def get_sql(self, with_default_expression=True): - from .utils import escape return 'Nullable(%s)' % self.inner_field.get_sql(with_default_expression=False)