openstack/deb-python-sqlalchemy-utils
Code Issues Proposed changes

Made Arrow and IPAddress types use ScalarCoercible

Browse Source
This commit is contained in:
Konsta Vesterinen
2013-10-24 11:31:04 +03:00
parent 7dc71d2719
commit 576edb19a5
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sqlalchemy_utils/types/arrow.py
View File

@@ -10,9 +10,10 @@ except:
pass pass
from sqlalchemy import types from sqlalchemy import types
from sqlalchemy_utils import ImproperlyConfigured from sqlalchemy_utils import ImproperlyConfigured
from .scalar_coercible import ScalarCoercible
class ArrowType(types.TypeDecorator): class ArrowType(types.TypeDecorator, ScalarCoercible):
impl = types.DateTime impl = types.DateTime
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
@@ -33,7 +34,7 @@ class ArrowType(types.TypeDecorator):
return arrow.get(value) return arrow.get(value)
return value return value
def coercion_listener(self, target, value, oldvalue, initiator): def _coerce(self, value):
if value is None: if value is None:
return None return None
elif isinstance(value, six.string_types): elif isinstance(value, six.string_types):

5
sqlalchemy_utils/types/ip_address.py
View File

@@ -12,9 +12,10 @@ except ImportError:
from sqlalchemy import types from sqlalchemy import types
from sqlalchemy_utils import ImproperlyConfigured from sqlalchemy_utils import ImproperlyConfigured
from .scalar_coercible import ScalarCoercible
class IPAddressType(types.TypeDecorator): class IPAddressType(types.TypeDecorator, ScalarCoercible):
""" """
Changes IPAddress objects to a string representation on the way in and Changes IPAddress objects to a string representation on the way in and
changes them back to IPAddress objects on the way out. changes them back to IPAddress objects on the way out.
@@ -38,5 +39,5 @@ class IPAddressType(types.TypeDecorator):
def process_result_value(self, value, dialect): def process_result_value(self, value, dialect):
return ip_address(value) if value else None return ip_address(value) if value else None
def coercion_listener(self, target, value, oldvalue, initiator): def _coerce(self, value):
return ip_address(value) if value else None return ip_address(value) if value else None