Infinidat/infi.clickhouse_orm
1
1
Fork 0
mirror of https://github.com/Infinidat/infi.clickhouse_orm.git synced 2025-07-24 23:09:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Trivial fix nullable field disregard extra_null_values

Browse Source
This commit is contained in:
fanchi 2018-07-02 10:47:36 +03:00
parent 50550ac6b6
commit a836031d36
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/infi/clickhouse_orm/fields.py
View File

@ -385,12 +385,12 @@ class NullableField(Field):
super(NullableField, self).__init__(default, alias, materialized, readonly=None) super(NullableField, self).__init__(default, alias, materialized, readonly=None)
def to_python(self, value, timezone_in_use): 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 None
return self.inner_field.to_python(value, timezone_in_use) return self.inner_field.to_python(value, timezone_in_use)
def validate(self, value): 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): def to_db_string(self, value, quote=True):
if value in self._null_values: if value in self._null_values:
@ -398,5 +398,4 @@ class NullableField(Field):
return self.inner_field.to_db_string(value, quote=quote) return self.inner_field.to_db_string(value, quote=quote)
def get_sql(self, with_default_expression=True): def get_sql(self, with_default_expression=True):
from .utils import escape
return 'Nullable(%s)' % self.inner_field.get_sql(with_default_expression=False) return 'Nullable(%s)' % self.inner_field.get_sql(with_default_expression=False)