diff options
Diffstat (limited to 'lib/sqlalchemy/orm/sync.py')
| -rw-r--r-- | lib/sqlalchemy/orm/sync.py | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/lib/sqlalchemy/orm/sync.py b/lib/sqlalchemy/orm/sync.py index 39a7b5044..eca80df25 100644 --- a/lib/sqlalchemy/orm/sync.py +++ b/lib/sqlalchemy/orm/sync.py @@ -8,31 +8,27 @@ based on join conditions. """ -from sqlalchemy import schema, exceptions, util -from sqlalchemy.sql import visitors, operators, util as sqlutil -from sqlalchemy import logging -from sqlalchemy.orm import util as mapperutil -from sqlalchemy.orm.interfaces import ONETOMANY, MANYTOONE, MANYTOMANY # legacy +from sqlalchemy.orm import exc, util as mapperutil def populate(source, source_mapper, dest, dest_mapper, synchronize_pairs): for l, r in synchronize_pairs: try: value = source_mapper._get_state_attr_by_column(source, l) - except exceptions.UnmappedColumnError: + except exc.UnmappedColumnError: _raise_col_to_prop(False, source_mapper, l, dest_mapper, r) try: dest_mapper._set_state_attr_by_column(dest, r, value) - except exceptions.UnmappedColumnError: - self._raise_col_to_prop(True, source_mapper, l, dest_mapper, r) + except exc.UnmappedColumnError: + _raise_col_to_prop(True, source_mapper, l, dest_mapper, r) def clear(dest, dest_mapper, synchronize_pairs): for l, r in synchronize_pairs: if r.primary_key: - raise exceptions.AssertionError("Dependency rule tried to blank-out primary key column '%s' on instance '%s'" % (r, mapperutil.state_str(dest))) + raise AssertionError("Dependency rule tried to blank-out primary key column '%s' on instance '%s'" % (r, mapperutil.state_str(dest))) try: dest_mapper._set_state_attr_by_column(dest, r, None) - except exceptions.UnmappedColumnError: + except exc.UnmappedColumnError: _raise_col_to_prop(True, None, l, dest_mapper, r) def update(source, source_mapper, dest, old_prefix, synchronize_pairs): @@ -40,8 +36,8 @@ def update(source, source_mapper, dest, old_prefix, synchronize_pairs): try: oldvalue = source_mapper._get_committed_attr_by_column(source.obj(), l) value = source_mapper._get_state_attr_by_column(source, l) - except exceptions.UnmappedColumnError: - self._raise_col_to_prop(False, source_mapper, l, None, r) + except exc.UnmappedColumnError: + _raise_col_to_prop(False, source_mapper, l, None, r) dest[r.key] = value dest[old_prefix + r.key] = oldvalue @@ -49,16 +45,16 @@ def populate_dict(source, source_mapper, dict_, synchronize_pairs): for l, r in synchronize_pairs: try: value = source_mapper._get_state_attr_by_column(source, l) - except exceptions.UnmappedColumnError: + except exc.UnmappedColumnError: _raise_col_to_prop(False, source_mapper, l, None, r) - + dict_[r.key] = value def source_changes(uowcommit, source, source_mapper, synchronize_pairs): for l, r in synchronize_pairs: try: prop = source_mapper._get_col_to_prop(l) - except exceptions.UnmappedColumnError: + except exc.UnmappedColumnError: _raise_col_to_prop(False, source_mapper, l, None, r) (added, unchanged, deleted) = uowcommit.get_attribute_history(source, prop.key, passive=True) if added and deleted: @@ -70,7 +66,7 @@ def dest_changes(uowcommit, dest, dest_mapper, synchronize_pairs): for l, r in synchronize_pairs: try: prop = dest_mapper._get_col_to_prop(r) - except exceptions.UnmappedColumnError: + except exc.UnmappedColumnError: _raise_col_to_prop(True, None, l, dest_mapper, r) (added, unchanged, deleted) = uowcommit.get_attribute_history(dest, prop.key, passive=True) if added and deleted: @@ -80,7 +76,6 @@ def dest_changes(uowcommit, dest, dest_mapper, synchronize_pairs): def _raise_col_to_prop(isdest, source_mapper, source_column, dest_mapper, dest_column): if isdest: - raise exceptions.UnmappedColumnError("Can't execute sync rule for destination column '%s'; mapper '%s' does not map this column. Try using an explicit `foreign_keys` collection which does not include this column (or use a viewonly=True relation)." % (dest_column, source_mapper)) + raise exc.UnmappedColumnError("Can't execute sync rule for destination column '%s'; mapper '%s' does not map this column. Try using an explicit `foreign_keys` collection which does not include this column (or use a viewonly=True relation)." % (dest_column, source_mapper)) else: - raise exceptions.UnmappedColumnError("Can't execute sync rule for source column '%s'; mapper '%s' does not map this column. Try using an explicit `foreign_keys` collection which does not include destination column '%s' (or use a viewonly=True relation)." % (source_column, source_mapper, dest_column)) - + raise exc.UnmappedColumnError("Can't execute sync rule for source column '%s'; mapper '%s' does not map this column. Try using an explicit `foreign_keys` collection which does not include destination column '%s' (or use a viewonly=True relation)." % (source_column, source_mapper, dest_column)) |