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

Refactor naturally_equivalent

Browse Source
This commit is contained in:
Konsta Vesterinen
2014-12-12 19:26:29 +02:00
parent f16a4dc321
commit 74d332bdeb
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sqlalchemy_utils/functions/orm.py
View File

@@ -843,13 +843,10 @@ def naturally_equivalent(obj, obj2):
:param obj: SQLAlchemy declarative model object :param obj: SQLAlchemy declarative model object
:param obj2: SQLAlchemy declarative model object to compare with `obj` :param obj2: SQLAlchemy declarative model object to compare with `obj`
""" """
for prop in sa.inspect(obj.__class__).iterate_properties: for column_key, column in sa.inspect(obj.__class__).columns.items():
if not isinstance(prop, sa.orm.ColumnProperty): if column.primary_key:
continue continue
if prop.columns[0].primary_key: if not (getattr(obj, column_key) == getattr(obj2, column_key)):
continue
if not (getattr(obj, prop.key) == getattr(obj2, prop.key)):
return False return False
return True return True